diff --git a/apps/activedirectory/local/mode/dfsrbacklog.pm b/apps/activedirectory/local/mode/dfsrbacklog.pm index 8440d4645..d81c421bd 100644 --- a/apps/activedirectory/local/mode/dfsrbacklog.pm +++ b/apps/activedirectory/local/mode/dfsrbacklog.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'backlog' } ], output_template => 'Backlog File Count : %s', perfdatas => [ - { label => 'backlog', value => 'backlog_absolute', template => '%s', min => 0 }, + { label => 'backlog', value => 'backlog', template => '%s', min => 0 }, ], } }, diff --git a/apps/antivirus/kaspersky/snmp/mode/deployment.pm b/apps/antivirus/kaspersky/snmp/mode/deployment.pm index 29e28796e..a9569f8b6 100644 --- a/apps/antivirus/kaspersky/snmp/mode/deployment.pm +++ b/apps/antivirus/kaspersky/snmp/mode/deployment.pm @@ -178,7 +178,7 @@ sub set_counters { key_values => [ { name => 'hostsRemoteInstallFailed' } ], output_template => '%d failed remote installation(s)', perfdatas => [ - { label => 'failed', value => 'hostsRemoteInstallFailed_absolute', template => '%d', min => 0 }, + { label => 'failed', value => 'hostsRemoteInstallFailed', template => '%d', min => 0 }, ], } }, diff --git a/apps/antivirus/kaspersky/snmp/mode/events.pm b/apps/antivirus/kaspersky/snmp/mode/events.pm index 9e230a585..ed45e8c49 100644 --- a/apps/antivirus/kaspersky/snmp/mode/events.pm +++ b/apps/antivirus/kaspersky/snmp/mode/events.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'criticalEventsCount' } ], output_template => '%d critical event(s)', perfdatas => [ - { label => 'events', value => 'criticalEventsCount_absolute', template => '%d', min => 0 }, + { label => 'events', value => 'criticalEventsCount', template => '%d', min => 0 }, ], } }, diff --git a/apps/antivirus/kaspersky/snmp/mode/fullscan.pm b/apps/antivirus/kaspersky/snmp/mode/fullscan.pm index 516bac8ec..82e2e8ed4 100644 --- a/apps/antivirus/kaspersky/snmp/mode/fullscan.pm +++ b/apps/antivirus/kaspersky/snmp/mode/fullscan.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'hostsNotScannedLately' } ], output_template => '%d hosts(s) has not been scanned lately', perfdatas => [ - { label => 'not_scanned', value => 'hostsNotScannedLately_absolute', template => '%d', min => 0 }, + { label => 'not_scanned', value => 'hostsNotScannedLately', template => '%d', min => 0 }, ], } }, diff --git a/apps/antivirus/kaspersky/snmp/mode/logicalnetwork.pm b/apps/antivirus/kaspersky/snmp/mode/logicalnetwork.pm index 9f2c2e56b..f15834ba5 100644 --- a/apps/antivirus/kaspersky/snmp/mode/logicalnetwork.pm +++ b/apps/antivirus/kaspersky/snmp/mode/logicalnetwork.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'hostsFound' } ], output_template => '%d new host(s) found', perfdatas => [ - { label => 'new_hosts', value => 'hostsFound_absolute', template => '%d', min => 0 }, + { label => 'new_hosts', value => 'hostsFound', template => '%d', min => 0 }, ], } }, @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'groupsCount' } ], output_template => '%d group(s) on the server', perfdatas => [ - { label => 'groups', value => 'groupsCount_absolute', template => '%d', min => 0 }, + { label => 'groups', value => 'groupsCount', template => '%d', min => 0 }, ], } }, @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'hostsNotConnectedLongTime' } ], output_template => '%d host(s) has not connected for a long time', perfdatas => [ - { label => 'not_connected_long_time', value => 'hostsNotConnectedLongTime_absolute', template => '%d', min => 0 }, + { label => 'not_connected_long_time', value => 'hostsNotConnectedLongTime', template => '%d', min => 0 }, ], } }, @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'hostsControlLost' } ], output_template => '%d host(s) are not controlled', perfdatas => [ - { label => 'not_controlled', value => 'hostsControlLost_absolute', template => '%d', min => 0 }, + { label => 'not_controlled', value => 'hostsControlLost', template => '%d', min => 0 }, ], } }, diff --git a/apps/antivirus/kaspersky/snmp/mode/protection.pm b/apps/antivirus/kaspersky/snmp/mode/protection.pm index e3fcdda29..85ca7ca95 100644 --- a/apps/antivirus/kaspersky/snmp/mode/protection.pm +++ b/apps/antivirus/kaspersky/snmp/mode/protection.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'hostsAntivirusNotRunning' } ], output_template => '%d host(s) without running antivirus', perfdatas => [ - { label => 'no_antivirus', value => 'hostsAntivirusNotRunning_absolute', template => '%d', min => 0 }, + { label => 'no_antivirus', value => 'hostsAntivirusNotRunning', template => '%d', min => 0 }, ], } }, @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'hostsRealtimeNotRunning' } ], output_template => '%d hosts(s) without running real time protection', perfdatas => [ - { label => 'no_real_time', value => 'hostsRealtimeNotRunning_absolute', template => '%d', min => 0 }, + { label => 'no_real_time', value => 'hostsRealtimeNotRunning', template => '%d', min => 0 }, ], } }, @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'hostsRealtimeLevelChanged' } ], output_template => '%d host(s) with not acceptable level of real time protection', perfdatas => [ - { label => 'not_acceptable_level', value => 'hostsRealtimeLevelChanged_absolute', template => '%d', min => 0 }, + { label => 'not_acceptable_level', value => 'hostsRealtimeLevelChanged', template => '%d', min => 0 }, ], } }, @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'hostsNotCuredObject' } ], output_template => '%d host(s) with not cured objects', perfdatas => [ - { label => 'not_cured_objects', value => 'hostsNotCuredObject_absolute', template => '%d', min => 0 }, + { label => 'not_cured_objects', value => 'hostsNotCuredObject', template => '%d', min => 0 }, ], } }, @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => 'hostsTooManyThreats' } ], output_template => '%d host(s) with too many threats', perfdatas => [ - { label => 'too_many_threats', value => 'hostsTooManyThreats_absolute', template => '%d', min => 0 }, + { label => 'too_many_threats', value => 'hostsTooManyThreats', template => '%d', min => 0 }, ], } }, diff --git a/apps/antivirus/kaspersky/snmp/mode/updates.pm b/apps/antivirus/kaspersky/snmp/mode/updates.pm index a05aa5a1e..740cbba6b 100644 --- a/apps/antivirus/kaspersky/snmp/mode/updates.pm +++ b/apps/antivirus/kaspersky/snmp/mode/updates.pm @@ -124,7 +124,7 @@ sub set_counters { key_values => [ { name => 'hostsNotUpdated' } ], output_template => '%d host(s) not up to date', perfdatas => [ - { label => 'not_updated', value => 'hostsNotUpdated_absolute', template => '%d', min => 0 } + { label => 'not_updated', value => 'hostsNotUpdated', template => '%d', min => 0 } ] } } diff --git a/apps/antivirus/mcafee/webgateway/snmp/mode/clients.pm b/apps/antivirus/mcafee/webgateway/snmp/mode/clients.pm index 10642d275..e85e53471 100644 --- a/apps/antivirus/mcafee/webgateway/snmp/mode/clients.pm +++ b/apps/antivirus/mcafee/webgateway/snmp/mode/clients.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'stClientCount' } ], output_template => 'Connected clients: %d', perfdatas => [ - { label => 'connected_clients', value => 'stClientCount_absolute', template => '%d', + { label => 'connected_clients', value => 'stClientCount', template => '%d', min => 0, unit => 'clients' }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'stConnectedSockets' } ], output_template => 'Open network sockets: %d', perfdatas => [ - { label => 'open_sockets', value => 'stConnectedSockets_absolute', template => '%d', + { label => 'open_sockets', value => 'stConnectedSockets', template => '%d', min => 0, unit => 'sockets' }, ], } diff --git a/apps/antivirus/mcafee/webgateway/snmp/mode/connections.pm b/apps/antivirus/mcafee/webgateway/snmp/mode/connections.pm index 613419d13..b41160c3a 100644 --- a/apps/antivirus/mcafee/webgateway/snmp/mode/connections.pm +++ b/apps/antivirus/mcafee/webgateway/snmp/mode/connections.pm @@ -35,52 +35,42 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'legitimate', set => { - key_values => [ { name => 'stConnectionsLegitimate', diff => 1 } ], + key_values => [ { name => 'stConnectionsLegitimate', per_second => 1 } ], output_template => 'Legitimate: %d', - per_second => 1, perfdatas => [ - { label => 'legitimate_connections', value => 'stConnectionsLegitimate_per_second', template => '%d', - min => 0, unit => 'connections/s' }, + { label => 'legitimate_connections', template => '%d', min => 0, unit => 'connections/s' }, ], } }, { label => 'blocked', set => { - key_values => [ { name => 'stConnectionsBlocked', diff => 1 } ], + key_values => [ { name => 'stConnectionsBlocked', per_second => 1 } ], output_template => 'Blocked: %d', - per_second => 1, perfdatas => [ - { label => 'blocked_connections', value => 'stConnectionsBlocked_per_second', template => '%d', - min => 0, unit => 'connections/s' }, + { label => 'blocked_connections', template => '%d', min => 0, unit => 'connections/s' }, ], } }, { label => 'blocked-by-am', set => { - key_values => [ { name => 'stBlockedByAntiMalware', diff => 1 } ], + key_values => [ { name => 'stBlockedByAntiMalware', per_second => 1 } ], output_template => 'Blocked by Anti Malware: %d', - per_second => 1, perfdatas => [ - { label => 'blocked_by_am', value => 'stBlockedByAntiMalware_per_second', template => '%d', - min => 0, unit => 'connections/s' }, + { label => 'blocked_by_am', template => '%d', min => 0, unit => 'connections/s' }, ], } }, { label => 'blocked-by-mf', set => { - key_values => [ { name => 'stBlockedByMediaFilter', diff => 1 } ], + key_values => [ { name => 'stBlockedByMediaFilter', per_second => 1 } ], output_template => 'Blocked by Media Filter: %d', - per_second => 1, perfdatas => [ - { label => 'blocked_by_mf', value => 'stBlockedByMediaFilter_per_second', template => '%d', - min => 0, unit => 'connections/s' }, + { label => 'blocked_by_mf', template => '%d', min => 0, unit => 'connections/s' }, ], } }, { label => 'blocked-by-uf', set => { - key_values => [ { name => 'stBlockedByURLFilter', diff => 1 } ], + key_values => [ { name => 'stBlockedByURLFilter', per_second => 1 } ], output_template => 'Blocked by URL Filter: %d', - per_second => 1, perfdatas => [ - { label => 'blocked_by_uf', value => 'stBlockedByURLFilter_per_second', template => '%d', - min => 0, unit => 'connections/s' }, + { label => 'blocked_by_uf', template => '%d', min => 0, unit => 'connections/s' }, ], } }, @@ -98,16 +88,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters', default => '' }, - }); - return $self; -} + $options{options}->add_options(arguments => { + }); -sub check_options { - my ($self, %options) = @_; - $self->SUPER::check_options(%options); + return $self; } my $oid_stConnectionsLegitimate = '.1.3.6.1.4.1.1230.2.7.2.1.3.0'; diff --git a/apps/antivirus/mcafee/webgateway/snmp/mode/detections.pm b/apps/antivirus/mcafee/webgateway/snmp/mode/detections.pm index fe98f1f89..c0ee3d4fc 100644 --- a/apps/antivirus/mcafee/webgateway/snmp/mode/detections.pm +++ b/apps/antivirus/mcafee/webgateway/snmp/mode/detections.pm @@ -37,28 +37,25 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'malware-detected', set => { - key_values => [ { name => 'stMalwareDetected', diff => 1 } ], + key_values => [ { name => 'stMalwareDetected', per_second => 1 } ], output_template => 'Malware detected (per sec): %d', - per_second => 1, perfdatas => [ - { label => 'malware_detected', value => 'stMalwareDetected_per_second', template => '%d', - min => 0, unit => 'detections/s' }, - ], + { label => 'malware_detected', template => '%d', min => 0, unit => 'detections/s' } + ] } - }, + } ]; $self->{maps_counters}->{categories} = [ { label => 'category', set => { - key_values => [ { name => 'stCategoryCount', diff => 1 }, { name => 'stCategoryName' } ], + key_values => [ { name => 'stCategoryCount', per_second => 1 }, { name => 'stCategoryName' } ], output_template => 'detections (per sec): %d', - per_second => 1, perfdatas => [ - { label => 'category', value => 'stCategoryCount_per_second', template => '%d', + { label => 'category', template => '%d', min => 0, unit => 'detections/s', label_extra_instance => 1, - instance_use => 'stCategoryName_absolute' }, - ], + instance_use => 'stCategoryName' } + ] } - }, + } ]; } @@ -73,17 +70,11 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "filter-counters:s" => { name => 'filter_counters', default => '' }, - }); - return $self; -} + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); -sub check_options { - my ($self, %options) = @_; - $self->SUPER::check_options(%options); + return $self; } my $oid_stMalwareDetected = '.1.3.6.1.4.1.1230.2.7.2.1.2.0'; diff --git a/apps/antivirus/mcafee/webgateway/snmp/mode/ftpstatistics.pm b/apps/antivirus/mcafee/webgateway/snmp/mode/ftpstatistics.pm index 2a908517e..472846878 100644 --- a/apps/antivirus/mcafee/webgateway/snmp/mode/ftpstatistics.pm +++ b/apps/antivirus/mcafee/webgateway/snmp/mode/ftpstatistics.pm @@ -35,46 +35,38 @@ sub set_counters { $self->{maps_counters}->{traffics} = [ { label => 'client-to-proxy', set => { - key_values => [ { name => 'stFtpBytesFromClient', diff => 1 } ], + key_values => [ { name => 'stFtpBytesFromClient', per_second => 1 } ], output_template => 'from client to proxy: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'ftp_traffic_client_to_proxy', value => 'stFtpBytesFromClient_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'ftp_traffic_client_to_proxy', template => '%d', min => 0, unit => 'b/s' }, ], } }, { label => 'server-to-proxy', set => { - key_values => [ { name => 'stFtpBytesFromServer', diff => 1 } ], + key_values => [ { name => 'stFtpBytesFromServer', per_second => 1 } ], output_template => 'from server to proxy: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'ftp_traffic_server_to_proxy', value => 'stFtpBytesFromServer_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'ftp_traffic_server_to_proxy', template => '%d', min => 0, unit => 'b/s' }, ], } }, { label => 'proxy-to-client', set => { - key_values => [ { name => 'stFtpBytesToClient', diff => 1 } ], + key_values => [ { name => 'stFtpBytesToClient', per_second => 1 } ], output_template => 'from proxy to client: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'ftp_traffic_proxy_to_client', value => 'stFtpBytesToClient_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'ftp_traffic_proxy_to_client', template => '%d', min => 0, unit => 'b/s' }, ], } }, { label => 'proxy-to-server', set => { - key_values => [ { name => 'stFtpBytesToServer', diff => 1 } ], + key_values => [ { name => 'stFtpBytesToServer', per_second => 1 } ], output_template => 'from proxy to server: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'ftp_traffic_proxy_to_server', value => 'stFtpBytesToServer_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'ftp_traffic_proxy_to_server', template => '%d', min => 0, unit => 'b/s' }, ], } }, @@ -92,16 +84,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters', default => '' }, - }); - return $self; -} + $options{options}->add_options(arguments => { + }); -sub check_options { - my ($self, %options) = @_; - $self->SUPER::check_options(%options); + return $self; } my $oid_stFtpBytesFromClient = '.1.3.6.1.4.1.1230.2.7.2.4.2.0'; diff --git a/apps/antivirus/mcafee/webgateway/snmp/mode/httpsstatistics.pm b/apps/antivirus/mcafee/webgateway/snmp/mode/httpsstatistics.pm index b461a9285..c1faf9c57 100644 --- a/apps/antivirus/mcafee/webgateway/snmp/mode/httpsstatistics.pm +++ b/apps/antivirus/mcafee/webgateway/snmp/mode/httpsstatistics.pm @@ -36,58 +36,48 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'requests', set => { - key_values => [ { name => 'stHttpsRequests', diff => 1 } ], + key_values => [ { name => 'stHttpsRequests', per_second => 1 } ], output_template => 'HTTPS Requests (per sec): %d', - per_second => 1, perfdatas => [ - { label => 'https_requests', value => 'stHttpsRequests_per_second', template => '%d', - min => 0, unit => 'requests/s' }, + { label => 'https_requests', template => '%d', min => 0, unit => 'requests/s' }, ], } }, ]; $self->{maps_counters}->{traffics} = [ { label => 'client-to-proxy', set => { - key_values => [ { name => 'stHttpsBytesFromClient', diff => 1 } ], + key_values => [ { name => 'stHttpsBytesFromClient', per_second => 1 } ], output_template => 'from client to proxy: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'https_traffic_client_to_proxy', value => 'stHttpsBytesFromClient_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'https_traffic_client_to_proxy', template => '%d', min => 0, unit => 'b/s' }, ], } }, { label => 'server-to-proxy', set => { - key_values => [ { name => 'stHttpsBytesFromServer', diff => 1 } ], + key_values => [ { name => 'stHttpsBytesFromServer', per_second => 1 } ], output_template => 'from server to proxy: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'https_traffic_server_to_proxy', value => 'stHttpsBytesFromServer_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'https_traffic_server_to_proxy', template => '%d', min => 0, unit => 'b/s' }, ], } }, { label => 'proxy-to-client', set => { - key_values => [ { name => 'stHttpsBytesToClient', diff => 1 } ], + key_values => [ { name => 'stHttpsBytesToClient', per_second => 1 } ], output_template => 'from proxy to client: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'https_traffic_proxy_to_client', value => 'stHttpsBytesToClient_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'https_traffic_proxy_to_client', template => '%d', min => 0, unit => 'b/s' }, ], } }, { label => 'proxy-to-server', set => { - key_values => [ { name => 'stHttpsBytesToServer', diff => 1 } ], + key_values => [ { name => 'stHttpsBytesToServer', per_second => 1 } ], output_template => 'from proxy to server: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'https_traffic_proxy_to_server', value => 'stHttpsBytesToServer_per_second', template => '%d', - min => 0, unit => 'b/s' }, + { label => 'https_traffic_proxy_to_server', template => '%d', min => 0, unit => 'b/s' }, ], } }, @@ -105,16 +95,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters', default => '' }, - }); - return $self; -} + $options{options}->add_options(arguments => { + }); -sub check_options { - my ($self, %options) = @_; - $self->SUPER::check_options(%options); + return $self; } my $oid_stHttpsRequests = '.1.3.6.1.4.1.1230.2.7.2.3.1.0'; diff --git a/apps/antivirus/mcafee/webgateway/snmp/mode/httpstatistics.pm b/apps/antivirus/mcafee/webgateway/snmp/mode/httpstatistics.pm index 8c6fbdf5e..9804c6a1c 100644 --- a/apps/antivirus/mcafee/webgateway/snmp/mode/httpstatistics.pm +++ b/apps/antivirus/mcafee/webgateway/snmp/mode/httpstatistics.pm @@ -36,61 +36,52 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'requests', set => { - key_values => [ { name => 'stHttpRequests', diff => 1 } ], + key_values => [ { name => 'stHttpRequests', per_second => 1 } ], output_template => 'HTTP Requests (per sec): %d', - per_second => 1, perfdatas => [ - { label => 'http_requests', value => 'stHttpRequests_per_second', template => '%d', - min => 0, unit => 'requests/s' }, - ], + { label => 'http_requests', template => '%d', min => 0, unit => 'requests/s' } + ] } - }, + } ]; + $self->{maps_counters}->{traffics} = [ { label => 'client-to-proxy', set => { - key_values => [ { name => 'stHttpBytesFromClient', diff => 1 } ], + key_values => [ { name => 'stHttpBytesFromClient', per_second => 1 } ], output_template => 'from client to proxy: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'http_traffic_client_to_proxy', value => 'stHttpBytesFromClient_per_second', template => '%d', - min => 0, unit => 'b/s' }, - ], + { label => 'http_traffic_client_to_proxy', template => '%d', min => 0, unit => 'b/s' } + ] } }, { label => 'server-to-proxy', set => { - key_values => [ { name => 'stHttpBytesFromServer', diff => 1 } ], + key_values => [ { name => 'stHttpBytesFromServer', per_second => 1 } ], output_template => 'from server to proxy: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'http_traffic_server_to_proxy', value => 'stHttpBytesFromServer_per_second', template => '%d', - min => 0, unit => 'b/s' }, - ], + { label => 'http_traffic_server_to_proxy', template => '%d', min => 0, unit => 'b/s' } + ] } }, { label => 'proxy-to-client', set => { - key_values => [ { name => 'stHttpBytesToClient', diff => 1 } ], + key_values => [ { name => 'stHttpBytesToClient', per_second => 1 } ], output_template => 'from proxy to client: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'http_traffic_proxy_to_client', value => 'stHttpBytesToClient_per_second', template => '%d', - min => 0, unit => 'b/s' }, - ], + { label => 'http_traffic_proxy_to_client', template => '%d', min => 0, unit => 'b/s' } + ] } }, { label => 'proxy-to-server', set => { - key_values => [ { name => 'stHttpBytesToServer', diff => 1 } ], + key_values => [ { name => 'stHttpBytesToServer', per_second => 1 } ], output_template => 'from proxy to server: %s %s/s', output_change_bytes => 2, - per_second => 1, perfdatas => [ - { label => 'http_traffic_proxy_to_server', value => 'stHttpBytesToServer_per_second', template => '%d', - min => 0, unit => 'b/s' }, - ], + { label => 'http_traffic_proxy_to_server', template => '%d', min => 0, unit => 'b/s' } + ] } - }, + } ]; } @@ -105,16 +96,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters', default => '' }, - }); - return $self; -} + $options{options}->add_options(arguments => { + }); -sub check_options { - my ($self, %options) = @_; - $self->SUPER::check_options(%options); + return $self; } my $oid_stHttpRequests = '.1.3.6.1.4.1.1230.2.7.2.2.1.0'; diff --git a/apps/automation/ansible/tower/mode/dashboard.pm b/apps/automation/ansible/tower/mode/dashboard.pm index 37f1d3a22..1d6f10c6b 100644 --- a/apps/automation/ansible/tower/mode/dashboard.pm +++ b/apps/automation/ansible/tower/mode/dashboard.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'hosts_total' } ], output_template => 'Hosts Total: %d', perfdatas => [ - { value => 'hosts_total_absolute', template => '%d', min => 0 }, + { value => 'hosts_total', template => '%d', min => 0 }, ], } }, @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => 'hosts_failed' },{ name => 'hosts_total' } ], output_template => 'Hosts Failed: %d', perfdatas => [ - { value => 'hosts_failed_absolute', template => '%d', min => 0, - max => 'hosts_total_absolute' }, + { value => 'hosts_failed', template => '%d', min => 0, + max => 'hosts_total' }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'inventories_total' } ], output_template => 'Inventories Total: %d', perfdatas => [ - { value => 'inventories_total_absolute', template => '%d', min => 0 }, + { value => 'inventories_total', template => '%d', min => 0 }, ], } }, @@ -62,8 +62,8 @@ sub set_counters { key_values => [ { name => 'inventories_sync_failed' }, { name => 'inventories_total' } ], output_template => 'Inventories Sync Failed: %d', perfdatas => [ - { value => 'inventories_sync_failed_absolute', template => '%d', min => 0, - max => 'inventories_total_absolute' }, + { value => 'inventories_sync_failed', template => '%d', min => 0, + max => 'inventories_total' }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'projects_total' } ], output_template => 'Projects Total: %d', perfdatas => [ - { value => 'projects_total_absolute', template => '%d', min => 0 }, + { value => 'projects_total', template => '%d', min => 0 }, ], } }, @@ -79,8 +79,8 @@ sub set_counters { key_values => [ { name => 'projects_sync_failed' }, { name => 'projects_total' } ], output_template => 'Projects Sync Failed: %d', perfdatas => [ - { value => 'projects_sync_failed_absolute', template => '%d', min => 0, - max => 'projects_total_absolute' }, + { value => 'projects_sync_failed', template => '%d', min => 0, + max => 'projects_total' }, ], } }, diff --git a/apps/automation/ansible/tower/mode/inventorystatistics.pm b/apps/automation/ansible/tower/mode/inventorystatistics.pm index 3926e71ce..87416e821 100644 --- a/apps/automation/ansible/tower/mode/inventorystatistics.pm +++ b/apps/automation/ansible/tower/mode/inventorystatistics.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total: %d', perfdatas => [ - { value => 'total_absolute', template => '%d', min => 0 }, + { value => 'total', template => '%d', min => 0 }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'failed' }, { name => 'total' } ], output_template => 'Failed: %d', perfdatas => [ - { value => 'failed_absolute', template => '%d', min => 0, - max => 'total_absolute' }, + { value => 'failed', template => '%d', min => 0, + max => 'total' }, ], } }, @@ -58,8 +58,8 @@ sub set_counters { key_values => [ { name => 'total_hosts' }, { name => 'display' } ], output_template => 'Hosts total: %d', perfdatas => [ - { value => 'total_hosts_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'total_hosts', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -68,9 +68,9 @@ sub set_counters { { name => 'display' } ], output_template => 'Hosts failed: %d', perfdatas => [ - { value => 'hosts_with_active_failures_absolute', template => '%d', - min => 0, max => 'total_hosts_absolute', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { value => 'hosts_with_active_failures', template => '%d', + min => 0, max => 'total_hosts', label_extra_instance => 1, + instance_use => 'display' }, ], } }, @@ -78,8 +78,8 @@ sub set_counters { key_values => [ { name => 'total_inventory_sources' }, { name => 'display' } ], output_template => 'Sources total: %d', perfdatas => [ - { value => 'total_inventory_sources_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'total_inventory_sources', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -88,9 +88,9 @@ sub set_counters { { name => 'display' } ], output_template => 'Sources failed: %d', perfdatas => [ - { value => 'inventory_sources_with_failures_absolute', template => '%d', - min => 0, max => 'total_inventory_sources_absolute', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { value => 'inventory_sources_with_failures', template => '%d', + min => 0, max => 'total_inventory_sources', label_extra_instance => 1, + instance_use => 'display' }, ], } }, @@ -98,8 +98,8 @@ sub set_counters { key_values => [ { name => 'total_groups' }, { name => 'display' } ], output_template => 'Groups total: %d', perfdatas => [ - { value => 'total_groups_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'total_groups', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -108,9 +108,9 @@ sub set_counters { { name => 'display' } ], output_template => 'Groups failed: %d', perfdatas => [ - { value => 'groups_with_active_failures_absolute', template => '%d', - min => 0, max => 'total_groups_absolute', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { value => 'groups_with_active_failures', template => '%d', + min => 0, max => 'total_groups', label_extra_instance => 1, + instance_use => 'display' }, ], } }, diff --git a/apps/backup/arcserve/udp/mssql/mode/jobstatus.pm b/apps/backup/arcserve/udp/mssql/mode/jobstatus.pm index a4b77db17..e9345c2ff 100644 --- a/apps/backup/arcserve/udp/mssql/mode/jobstatus.pm +++ b/apps/backup/arcserve/udp/mssql/mode/jobstatus.pm @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total jobs : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } }, diff --git a/apps/backup/netapp/snapcenter/restapi/mode/jobs.pm b/apps/backup/netapp/snapcenter/restapi/mode/jobs.pm index 75e49c9dd..f1505e119 100644 --- a/apps/backup/netapp/snapcenter/restapi/mode/jobs.pm +++ b/apps/backup/netapp/snapcenter/restapi/mode/jobs.pm @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total jobs : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } }, diff --git a/apps/backup/netbackup/local/mode/dedupstatus.pm b/apps/backup/netbackup/local/mode/dedupstatus.pm index 9b1a0d5ea..a95ba12e2 100644 --- a/apps/backup/netbackup/local/mode/dedupstatus.pm +++ b/apps/backup/netbackup/local/mode/dedupstatus.pm @@ -46,9 +46,9 @@ sub custom_usage_threshold { my ($self, %options) = @_; if (!defined($self->{instance_mode}->{option_results}->{'critical-usage'}) || $self->{instance_mode}->{option_results}->{'critical-usage'} eq '') { - $self->{perfdata}->threshold_validate(label => 'critical-usage', value => $self->{result_values}->{watermark_absolute}); + $self->{perfdata}->threshold_validate(label => 'critical-usage', value => $self->{result_values}->{watermark}); } - return $self->{perfdata}->threshold_check(value => $self->{result_values}->{usage_absolute}, threshold => [ { label => 'critical-' . $self->{label}, exit_litteral => 'critical' }, { label => 'warning-'. $self->{label}, exit_litteral => 'warning' } ]); + return $self->{perfdata}->threshold_check(value => $self->{result_values}->{usage}, threshold => [ { label => 'critical-' . $self->{label}, exit_litteral => 'critical' }, { label => 'warning-'. $self->{label}, exit_litteral => 'warning' } ]); } sub set_counters { @@ -72,8 +72,8 @@ sub set_counters { output_template => 'Use: %s %%', closure_custom_threshold_check => $self->can('custom_usage_threshold'), perfdatas => [ - { label => 'used', value => 'usage_absolute', template => '%s', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'usage', template => '%s', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/backup/netbackup/local/mode/drivecleaning.pm b/apps/backup/netbackup/local/mode/drivecleaning.pm index 7aa29453b..cb917f03e 100644 --- a/apps/backup/netbackup/local/mode/drivecleaning.pm +++ b/apps/backup/netbackup/local/mode/drivecleaning.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'num_cleaning' }, { name => 'total' } ], output_template => '%d drives needs a reset mount time', perfdatas => [ - { label => 'cleaning', value => 'num_cleaning_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'cleaning', value => 'num_cleaning', template => '%s', + min => 0, max => 'total' }, ], } }, diff --git a/apps/backup/netbackup/local/mode/jobstatus.pm b/apps/backup/netbackup/local/mode/jobstatus.pm index 1a8c86967..68ee9144e 100644 --- a/apps/backup/netbackup/local/mode/jobstatus.pm +++ b/apps/backup/netbackup/local/mode/jobstatus.pm @@ -159,7 +159,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Jobs : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } }, diff --git a/apps/backup/quadstor/local/mode/vtltapeusage.pm b/apps/backup/quadstor/local/mode/vtltapeusage.pm index 94fc6a32a..ea5fdcd46 100644 --- a/apps/backup/quadstor/local/mode/vtltapeusage.pm +++ b/apps/backup/quadstor/local/mode/vtltapeusage.pm @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Number of tapes : %s', perfdatas => [ - { label => 'count', value => 'count_absolute', template => '%s', + { label => 'count', value => 'count', template => '%s', unit => 'tapes', min => 0 }, ], } diff --git a/apps/backup/rapidrecovery/snmp/mode/agent.pm b/apps/backup/rapidrecovery/snmp/mode/agent.pm index c34ddd689..c62762a41 100644 --- a/apps/backup/rapidrecovery/snmp/mode/agent.pm +++ b/apps/backup/rapidrecovery/snmp/mode/agent.pm @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total agents: %d', perfdatas => [ - { value => 'total_absolute', template => '%d', min => 0 }, + { value => 'total', template => '%d', min => 0 }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'recovery_points' }, { name => 'display' } ], output_template => 'recovery points: %s', perfdatas => [ - { value => 'recovery_points_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'recovery_points', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/backup/rapidrecovery/snmp/mode/repository.pm b/apps/backup/rapidrecovery/snmp/mode/repository.pm index 845070516..292c11f20 100644 --- a/apps/backup/rapidrecovery/snmp/mode/repository.pm +++ b/apps/backup/rapidrecovery/snmp/mode/repository.pm @@ -38,11 +38,11 @@ sub custom_space_output { my $msg = sprintf( "space total: %s %s used: %s %s (%.2f%%) free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); return $msg; } @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_space_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -76,8 +76,8 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_space_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'free', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -85,8 +85,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'space used: %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/backup/tsm/local/mode/drives.pm b/apps/backup/tsm/local/mode/drives.pm index c32ddeecf..ffc5e64b2 100644 --- a/apps/backup/tsm/local/mode/drives.pm +++ b/apps/backup/tsm/local/mode/drives.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'online' } ], output_template => 'online : %s', perfdatas => [ - { label => 'online', value => 'online_absolute', template => '%s', min => 0 }, + { label => 'online', value => 'online', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'offline' } ], output_template => 'offline : %s', perfdatas => [ - { label => 'offline', value => 'offline_absolute', template => '%s', min => 0 }, + { label => 'offline', value => 'offline', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'unavailable' } ], output_template => 'unavailable : %s', perfdatas => [ - { label => 'unavailable', value => 'unavailable_absolute', template => '%s', min => 0 }, + { label => 'unavailable', value => 'unavailable', template => '%s', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'empty' } ], output_template => 'empty : %s', perfdatas => [ - { label => 'empty', value => 'empty_absolute', template => '%s', min => 0 }, + { label => 'empty', value => 'empty', template => '%s', min => 0 }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'loaded' } ], output_template => 'loaded : %s', perfdatas => [ - { label => 'loaded', value => 'loaded_absolute', template => '%s', min => 0 }, + { label => 'loaded', value => 'loaded', template => '%s', min => 0 }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'unloaded' } ], output_template => 'unloaded : %s', perfdatas => [ - { label => 'unloaded', value => 'unloaded_absolute', template => '%s', min => 0 }, + { label => 'unloaded', value => 'unloaded', template => '%s', min => 0 }, ], } }, @@ -85,7 +85,7 @@ sub set_counters { key_values => [ { name => 'reserved' } ], output_template => 'reserved : %s', perfdatas => [ - { label => 'reserved', value => 'reserved_absolute', template => '%s', min => 0 }, + { label => 'reserved', value => 'reserved', template => '%s', min => 0 }, ], } }, @@ -93,7 +93,7 @@ sub set_counters { key_values => [ { name => 'unknown' } ], output_template => 'unknown : %s', perfdatas => [ - { label => 'unknown', value => 'unknown_absolute', template => '%s', min => 0 }, + { label => 'unknown', value => 'unknown', template => '%s', min => 0 }, ], } }, diff --git a/apps/backup/tsm/local/mode/nodes.pm b/apps/backup/tsm/local/mode/nodes.pm index b31b82dd7..e12367adc 100644 --- a/apps/backup/tsm/local/mode/nodes.pm +++ b/apps/backup/tsm/local/mode/nodes.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'associated' } ], output_template => 'Total Associated Nodes : %s', perfdatas => [ - { label => 'associated', value => 'associated_absolute', template => '%s', min => 0 }, + { label => 'associated', value => 'associated', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'non_associated' } ], output_template => 'Total Non Associated Nodes : %s', perfdatas => [ - { label => 'non_associated', value => 'non_associated_absolute', template => '%s', min => 0 }, + { label => 'non_associated', value => 'non_associated', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'locked' } ], output_template => 'Total Locked Nodes : %s', perfdatas => [ - { label => 'locked', value => 'locked_absolute', template => '%s', min => 0 }, + { label => 'locked', value => 'locked', template => '%s', min => 0 }, ], } }, diff --git a/apps/backup/tsm/local/mode/sessions.pm b/apps/backup/tsm/local/mode/sessions.pm index 8d05cbc95..ed5136fbe 100644 --- a/apps/backup/tsm/local/mode/sessions.pm +++ b/apps/backup/tsm/local/mode/sessions.pm @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Sessions : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } }, diff --git a/apps/backup/tsm/local/mode/volumes.pm b/apps/backup/tsm/local/mode/volumes.pm index d29d8bb3c..0625c9713 100644 --- a/apps/backup/tsm/local/mode/volumes.pm +++ b/apps/backup/tsm/local/mode/volumes.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Volumes Total : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'online' } ], output_template => 'Online : %s', perfdatas => [ - { label => 'online', value => 'online_absolute', template => '%s', min => 0 }, + { label => 'online', value => 'online', template => '%s', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'offline' } ], output_template => 'Offline : %s', perfdatas => [ - { label => 'offline', value => 'offline_absolute', template => '%s', min => 0 }, + { label => 'offline', value => 'offline', template => '%s', min => 0 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'empty' } ], output_template => 'Empty : %s', perfdatas => [ - { label => 'empty', value => 'empty_absolute', template => '%s', min => 0 }, + { label => 'empty', value => 'empty', template => '%s', min => 0 }, ], } }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'pending' } ], output_template => 'Pending : %s', perfdatas => [ - { label => 'pending', value => 'pending_absolute', template => '%s', min => 0 }, + { label => 'pending', value => 'pending', template => '%s', min => 0 }, ], } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'filling' } ], output_template => 'Filling : %s', perfdatas => [ - { label => 'filling', value => 'filling_absolute', template => '%s', min => 0 }, + { label => 'filling', value => 'filling', template => '%s', min => 0 }, ], } }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'full' } ], output_template => 'Full : %s', perfdatas => [ - { label => 'full', value => 'full_absolute', template => '%s', min => 0 }, + { label => 'full', value => 'full', template => '%s', min => 0 }, ], } }, @@ -97,8 +97,8 @@ sub set_counters { key_values => [ { name => 'prct_utilized' }, { name => 'display' } ], output_template => 'Usage : %s %%', perfdatas => [ - { label => 'used', value => 'prct_utilized_absolute', template => '%s', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'prct_utilized', template => '%s', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/backup/veeam/local/mode/jobstatus.pm b/apps/backup/veeam/local/mode/jobstatus.pm index aa034ffb0..fde71fa4b 100644 --- a/apps/backup/veeam/local/mode/jobstatus.pm +++ b/apps/backup/veeam/local/mode/jobstatus.pm @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Jobs : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', min => 0 } + { label => 'total', value => 'total', template => '%s', min => 0 } ] } } diff --git a/apps/backup/veeam/local/mode/tapejobs.pm b/apps/backup/veeam/local/mode/tapejobs.pm index 0c02c1bc6..ac7d8c372 100644 --- a/apps/backup/veeam/local/mode/tapejobs.pm +++ b/apps/backup/veeam/local/mode/tapejobs.pm @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total jobs: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 }, + { value => 'total', template => '%s', min => 0 }, ], } }, diff --git a/apps/bind9/web/mode/serverusage.pm b/apps/bind9/web/mode/serverusage.pm index 1c46d7f74..1595ea10f 100644 --- a/apps/bind9/web/mode/serverusage.pm +++ b/apps/bind9/web/mode/serverusage.pm @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => $map[$i]->[0], diff => 1 } ], output_template => $map[$i]->[1], perfdatas => [ - { label => $perf_label, value => $map[$i]->[0] . '_absolute', template => '%s', min => 0 }, + { label => $perf_label, value => $map[$i]->[0] , template => '%s', min => 0 }, ], } }; diff --git a/apps/bind9/web/mode/zoneusage.pm b/apps/bind9/web/mode/zoneusage.pm index fb5ffa02b..4325d6b50 100644 --- a/apps/bind9/web/mode/zoneusage.pm +++ b/apps/bind9/web/mode/zoneusage.pm @@ -63,8 +63,8 @@ sub set_counters { key_values => [ { name => $map[$i]->[0], diff => 1 }, { name => 'display' } ], output_template => $map[$i]->[1], perfdatas => [ - { label => $perf_label, value => $map[$i]->[0] . '_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => $perf_label, value => $map[$i]->[0] , template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/apps/bluemind/local/mode/core.pm b/apps/bluemind/local/mode/core.pm index a266e1a23..3a59239f5 100644 --- a/apps/bluemind/local/mode/core.pm +++ b/apps/bluemind/local/mode/core.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'calls_success', diff => 1 } ], output_template => 'success calls received: %s', perfdatas => [ - { value => 'calls_success_absolute', template => '%s', min => 0 } + { value => 'calls_success', template => '%s', min => 0 } ] } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'calls_failure', diff => 1 } ], output_template => 'failure calls received: %s', perfdatas => [ - { value => 'calls_failure_absolute', template => '%s', min => 0 } + { value => 'calls_failure', template => '%s', min => 0 } ] } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'heartbeat_broadcast', diff => 1 } ], output_template => 'broadcast heartbeat running: %s', perfdatas => [ - { value => 'heartbeat_broadcast_absolute', template => '%s', min => 0 } + { value => 'heartbeat_broadcast', template => '%s', min => 0 } ] } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'cluster_events', diff => 1 } ], output_template => 'directory cluster events: %s', perfdatas => [ - { value => 'cluster_events_absolute', template => '%s', min => 0 } + { value => 'cluster_events', template => '%s', min => 0 } ] } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'request_handling_time_total', diff => 1 } ], output_template => 'total request handling: %s ms', perfdatas => [ - { value => 'request_handling_time_total_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'request_handling_time_total', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -85,7 +85,7 @@ sub set_counters { key_values => [ { name => 'request_handling_time_mean' } ], output_template => 'mean request handling: %s ms', perfdatas => [ - { value => 'request_handling_time_mean_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'request_handling_time_mean', template => '%s', min => 0, unit => 'ms' } ] } } diff --git a/apps/bluemind/local/mode/eas.pm b/apps/bluemind/local/mode/eas.pm index fec8f7651..8ae1a0ea3 100644 --- a/apps/bluemind/local/mode/eas.pm +++ b/apps/bluemind/local/mode/eas.pm @@ -46,7 +46,7 @@ sub set_counters { output_template => 'total responses size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'response_size_absolute', template => '%s', min => 0, unit => 'B' } + { value => 'response_size', template => '%s', min => 0, unit => 'B' } ] } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'execution_total', diff => 1 } ], output_template => 'total execution: %s ms', perfdatas => [ - { value => 'execution_total_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'execution_total', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'execution_mean' } ], output_template => 'mean execution: %s ms', perfdatas => [ - { value => 'execution_mean_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'execution_mean', template => '%s', min => 0, unit => 'ms' } ] } } diff --git a/apps/bluemind/local/mode/hps.pm b/apps/bluemind/local/mode/hps.pm index 235191345..4eb1edfff 100644 --- a/apps/bluemind/local/mode/hps.pm +++ b/apps/bluemind/local/mode/hps.pm @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'auth_success', diff => 1 } ], output_template => 'success authentication: %s', perfdatas => [ - { value => 'auth_success_absolute', template => '%s', min => 0 } + { value => 'auth_success', template => '%s', min => 0 } ] } }, @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'auth_failure', diff => 1 } ], output_template => 'failure authentication: %s', perfdatas => [ - { value => 'auth_failure_absolute', template => '%s', min => 0 } + { value => 'auth_failure', template => '%s', min => 0 } ] } }, @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'requests_protected', diff => 1 } ], output_template => 'protected requests: %s', perfdatas => [ - { value => 'requests_protected_absolute', template => '%s', min => 0 } + { value => 'requests_protected', template => '%s', min => 0 } ] } }, @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'requests_maintenance', diff => 1 } ], output_template => 'maintenance requests: %s', perfdatas => [ - { value => 'requests_maintenance_absolute', template => '%s', min => 0 } + { value => 'requests_maintenance', template => '%s', min => 0 } ] } } @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'requests_time_total', diff => 1 }, { name => 'display' } ], output_template => 'total requests time: %s ms', perfdatas => [ - { value => 'requests_time_total_absolute', template => '%s', min => 0, unit => 'ms', label_extra_instance => 1 } + { value => 'requests_time_total', template => '%s', min => 0, unit => 'ms', label_extra_instance => 1 } ] } }, @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'requests_time_mean' }, { name => 'display' } ], output_template => 'mean requests time: %s ms', perfdatas => [ - { value => 'requests_time_mean_absolute', template => '%s', min => 0, unit => 'ms', label_extra_instance => 1 } + { value => 'requests_time_mean', template => '%s', min => 0, unit => 'ms', label_extra_instance => 1 } ] } }, @@ -103,7 +103,7 @@ sub set_counters { output_template => 'total requests size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'requests_size_absolute', template => '%s', min => 0, unit => 'B' } + { value => 'requests_size', template => '%s', min => 0, unit => 'B' } ] } }, @@ -111,7 +111,7 @@ sub set_counters { key_values => [ { name => 'requests', diff => 1 } ], output_template => 'total requests: %s', perfdatas => [ - { value => 'requests_absolute', template => '%s', min => 0 } + { value => 'requests', template => '%s', min => 0 } ] } } diff --git a/apps/bluemind/local/mode/ips.pm b/apps/bluemind/local/mode/ips.pm index 8b7b58c66..52f2454d8 100644 --- a/apps/bluemind/local/mode/ips.pm +++ b/apps/bluemind/local/mode/ips.pm @@ -43,7 +43,7 @@ sub set_counters { key_values => [ { name => 'active_connections' } ], output_template => 'active connections: %s', perfdatas => [ - { value => 'active_connections_absolute', template => '%s', min => 0 } + { value => 'active_connections', template => '%s', min => 0 } ] } } diff --git a/apps/bluemind/local/mode/lmtpd.pm b/apps/bluemind/local/mode/lmtpd.pm index 0a985bc71..c3d478bc8 100644 --- a/apps/bluemind/local/mode/lmtpd.pm +++ b/apps/bluemind/local/mode/lmtpd.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'active_connections' } ], output_template => 'active connections: %s', perfdatas => [ - { value => 'active_connections_absolute', template => '%s', min => 0 } + { value => 'active_connections', template => '%s', min => 0 } ] } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'connections', diff => 1 } ], output_template => 'total connections: %s', perfdatas => [ - { value => 'connections_absolute', template => '%s', min => 0 } + { value => 'connections', template => '%s', min => 0 } ] } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'deliveries_ok', diff => 1 } ], output_template => 'success deliveries: %s', perfdatas => [ - { value => 'deliveries_ok_absolute', template => '%s', min => 0 } + { value => 'deliveries_ok', template => '%s', min => 0 } ] } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'deliveries_ko', diff => 1 } ], output_template => 'failure deliveries: %s', perfdatas => [ - { value => 'deliveries_ko_absolute', template => '%s', min => 0 } + { value => 'deliveries_ko', template => '%s', min => 0 } ] } }, @@ -78,7 +78,7 @@ sub set_counters { output_template => 'total emails size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'email_size_absolute', template => '%s', min => 0, unit => 'B' } + { value => 'email_size', template => '%s', min => 0, unit => 'B' } ] } }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'session_duration_total', diff => 1 } ], output_template => 'total sessions duration: %s ms', perfdatas => [ - { value => 'session_duration_total_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'session_duration_total', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'session_duration_mean' } ], output_template => 'mean sessions duration: %s ms', perfdatas => [ - { value => 'session_duration_mean_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'session_duration_mean', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -102,7 +102,7 @@ sub set_counters { key_values => [ { name => 'traffic_latency_total', diff => 1 } ], output_template => 'total traffic transport latency: %s ms', perfdatas => [ - { value => 'traffic_latency_total_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'traffic_latency_total', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -110,7 +110,7 @@ sub set_counters { key_values => [ { name => 'traffic_latency_mean' } ], output_template => 'mean traffic transport latency: %s ms', perfdatas => [ - { value => 'traffic_latency_mean_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'traffic_latency_mean', template => '%s', min => 0, unit => 'ms' } ] } } diff --git a/apps/bluemind/local/mode/milter.pm b/apps/bluemind/local/mode/milter.pm index a762467f5..48db93d3a 100644 --- a/apps/bluemind/local/mode/milter.pm +++ b/apps/bluemind/local/mode/milter.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'connections', diff => 1 } ], output_template => 'total connections: %s', perfdatas => [ - { value => 'connections_absolute', template => '%s', min => 0 } + { value => 'connections', template => '%s', min => 0 } ] } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'traffic_class_inbound', diff => 1 } ], output_template => 'traffic class inbound: %s', perfdatas => [ - { value => 'traffic_class_inbound_absolute', template => '%s', min => 0 } + { value => 'traffic_class_inbound', template => '%s', min => 0 } ] } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'traffic_class_outbound', diff => 1 } ], output_template => 'traffic class outbound: %s', perfdatas => [ - { value => 'traffic_class_outbound_absolute', template => '%s', min => 0 } + { value => 'traffic_class_outbound', template => '%s', min => 0 } ] } }, @@ -70,7 +70,7 @@ sub set_counters { output_template => 'traffic size inbound: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'traffic_size_inbound_absolute', template => '%s', min => 0, unit => 'B' } + { value => 'traffic_size_inbound', template => '%s', min => 0, unit => 'B' } ] } }, @@ -79,7 +79,7 @@ sub set_counters { output_template => 'traffic size outbound: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'traffic_size_outbound_absolute', template => '%s', min => 0, unit => 'B' } + { value => 'traffic_size_outbound', template => '%s', min => 0, unit => 'B' } ] } }, @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'session_duration_total', diff => 1 } ], output_template => 'total sessions duration: %s ms', perfdatas => [ - { value => 'session_duration_total_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'session_duration_total', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'session_duration_mean' } ], output_template => 'mean sessions duration: %s ms', perfdatas => [ - { value => 'session_duration_mean_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'session_duration_mean', template => '%s', min => 0, unit => 'ms' } ] } } diff --git a/apps/bluemind/local/mode/webserver.pm b/apps/bluemind/local/mode/webserver.pm index 3e2aede4a..5a8c46cde 100644 --- a/apps/bluemind/local/mode/webserver.pm +++ b/apps/bluemind/local/mode/webserver.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'requests_time_total', diff => 1 } ], output_template => 'total requests time: %s ms', perfdatas => [ - { value => 'requests_time_total_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'requests_time_total', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'requests_time_mean' } ], output_template => 'mean requests time: %s ms', perfdatas => [ - { value => 'requests_time_mean_absolute', template => '%s', min => 0, unit => 'ms' } + { value => 'requests_time_mean', template => '%s', min => 0, unit => 'ms' } ] } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'requests', diff => 1 } ], output_template => 'total requests: %s', perfdatas => [ - { value => 'requests_absolute', template => '%s', min => 0 } + { value => 'requests', template => '%s', min => 0 } ] } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'requests_200', diff => 1 } ], output_template => 'total 200 requests: %s', perfdatas => [ - { value => 'requests_200_absolute', template => '%s', min => 0 } + { value => 'requests_200', template => '%s', min => 0 } ] } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'requests_304', diff => 1 } ], output_template => 'total 304 requests: %s', perfdatas => [ - { value => 'requests_304_absolute', template => '%s', min => 0 } + { value => 'requests_304', template => '%s', min => 0 } ] } } diff --git a/apps/bluemind/local/mode/xmpp.pm b/apps/bluemind/local/mode/xmpp.pm index 859d394ce..94f936112 100644 --- a/apps/bluemind/local/mode/xmpp.pm +++ b/apps/bluemind/local/mode/xmpp.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'packets_all', diff => 1 } ], output_template => 'all packets sent: %s', perfdatas => [ - { value => 'packets_all_absolute', template => '%s', min => 0 } + { value => 'packets_all', template => '%s', min => 0 } ] } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'packets_chat', diff => 1 } ], output_template => 'chat packets sent: %s', perfdatas => [ - { value => 'packets_chat_absolute', template => '%s', min => 0 } + { value => 'packets_chat', template => '%s', min => 0 } ] } } diff --git a/apps/centreon/local/mode/brokerstats.pm b/apps/centreon/local/mode/brokerstats.pm index 78f1b220b..788a18f1a 100644 --- a/apps/centreon/local/mode/brokerstats.pm +++ b/apps/centreon/local/mode/brokerstats.pm @@ -72,8 +72,8 @@ sub set_counters { key_values => [ { name => 'speed_events' }, { name => 'display' } ], output_template => 'Speed Events: %s/s', perfdatas => [ - { label => 'speed_events', value => 'speed_events_absolute', template => '%s', - unit => 'events/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'speed_events', value => 'speed_events', template => '%s', + unit => 'events/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -81,8 +81,8 @@ sub set_counters { key_values => [ { name => 'queued_events' }, { name => 'display' } ], output_template => 'Queued Events: %s', perfdatas => [ - { label => 'queued_events', value => 'queued_events_absolute', template => '%s', - unit => 'events', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'queued_events', value => 'queued_events', template => '%s', + unit => 'events', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -90,8 +90,8 @@ sub set_counters { key_values => [ { name => 'unacknowledged_events' }, { name => 'display' } ], output_template => 'Unacknowledged Events: %s', perfdatas => [ - { label => 'unacknowledged_events', value => 'unacknowledged_events_absolute', template => '%s', - unit => 'events', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'unacknowledged_events', value => 'unacknowledged_events', template => '%s', + unit => 'events', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/centreon/local/mode/centenginestats.pm b/apps/centreon/local/mode/centenginestats.pm index 644b9457a..73cc83791 100644 --- a/apps/centreon/local/mode/centenginestats.pm +++ b/apps/centreon/local/mode/centenginestats.pm @@ -31,9 +31,9 @@ sub custom_hosts_execution_time_output { return sprintf( 'hosts active execution time (avg/min/max): %.3f/%.3f/%.3f sec', - $self->{result_values}->{avg_absolute}, - $self->{result_values}->{min_absolute}, - $self->{result_values}->{max_absolute} + $self->{result_values}->{avg}, + $self->{result_values}->{min}, + $self->{result_values}->{max} ); } @@ -42,9 +42,9 @@ sub custom_services_execution_time_output { return sprintf( 'services active execution time (avg/min/max): %.3f/%.3f/%.3f sec', - $self->{result_values}->{avg_absolute}, - $self->{result_values}->{min_absolute}, - $self->{result_values}->{max_absolute} + $self->{result_values}->{avg}, + $self->{result_values}->{min}, + $self->{result_values}->{max} ); } @@ -53,10 +53,10 @@ sub custom_hosts_checked_output { return sprintf( 'hosts active checked last 1/5/15/60 min: %d/%d/%d/%d', - $self->{result_values}->{last1min_absolute}, - $self->{result_values}->{last5min_absolute}, - $self->{result_values}->{last15min_absolute}, - $self->{result_values}->{last60min_absolute}, + $self->{result_values}->{last1min}, + $self->{result_values}->{last5min}, + $self->{result_values}->{last15min}, + $self->{result_values}->{last60min}, ); } @@ -65,10 +65,10 @@ sub custom_services_checked_output { return sprintf( 'services active checked last 1/5/15/60 min: %d/%d/%d/%d', - $self->{result_values}->{last1min_absolute}, - $self->{result_values}->{last5min_absolute}, - $self->{result_values}->{last15min_absolute}, - $self->{result_values}->{last60min_absolute}, + $self->{result_values}->{last1min}, + $self->{result_values}->{last5min}, + $self->{result_values}->{last15min}, + $self->{result_values}->{last60min}, ); } @@ -77,9 +77,9 @@ sub custom_hosts_latency_output { return sprintf( 'hosts active latency (avg/min/max): %.3f/%.3f/%.3f sec', - $self->{result_values}->{avg_absolute}, - $self->{result_values}->{min_absolute}, - $self->{result_values}->{max_absolute} + $self->{result_values}->{avg}, + $self->{result_values}->{min}, + $self->{result_values}->{max} ); } @@ -88,9 +88,9 @@ sub custom_services_latency_output { return sprintf( 'services active latency (avg/min/max): %.3f/%.3f/%.3f sec', - $self->{result_values}->{avg_absolute}, - $self->{result_values}->{min_absolute}, - $self->{result_values}->{max_absolute} + $self->{result_values}->{avg}, + $self->{result_values}->{min}, + $self->{result_values}->{max} ); } @@ -99,9 +99,9 @@ sub custom_hosts_status_output { return sprintf( 'hosts status up/down/unreach: %d/%d/%d', - $self->{result_values}->{up_absolute}, - $self->{result_values}->{down_absolute}, - $self->{result_values}->{unreach_absolute} + $self->{result_values}->{up}, + $self->{result_values}->{down}, + $self->{result_values}->{unreach} ); } @@ -110,10 +110,10 @@ sub custom_services_status_output { return sprintf( 'services status ok/warn/unk/crit: %d/%d/%d/%d', - $self->{result_values}->{ok_absolute}, - $self->{result_values}->{warn_absolute}, - $self->{result_values}->{unk_absolute}, - $self->{result_values}->{crit_absolute} + $self->{result_values}->{ok}, + $self->{result_values}->{warn}, + $self->{result_values}->{unk}, + $self->{result_values}->{crit} ); } @@ -122,8 +122,8 @@ sub custom_commands_buffer_output { return sprintf( 'commands buffer current/max: %d/%d', - $self->{result_values}->{current_absolute}, - $self->{result_values}->{max_absolute} + $self->{result_values}->{current}, + $self->{result_values}->{max} ); } @@ -159,10 +159,10 @@ sub set_counters { key_values => [ { name => 'avg' }, { name => 'max' }, { name => 'min' } ], - threshold_use => $_->[0] . '_absolute', + threshold_use => $_->[0] , closure_custom_output => $self->can('custom_' . $type . '_execution_time_output'), perfdatas => [ - { value => $_->[0] . '_absolute', template => '%.3f', min => 0, unit => 's' }, + { value => $_->[0] , template => '%.3f', min => 0, unit => 's' }, ], } } @@ -180,10 +180,10 @@ sub set_counters { key_values => [ { name => 'last1min' }, { name => 'last5min' }, { name => 'last15min' }, { name => 'last60min' } ], - threshold_use => $_->[0] . '_absolute', + threshold_use => $_->[0] , closure_custom_output => $self->can('custom_' . $type . '_checked_output'), perfdatas => [ - { value => $_->[0] . '_absolute', template => '%d', min => 0 }, + { value => $_->[0] , template => '%d', min => 0 }, ], } } @@ -201,10 +201,10 @@ sub set_counters { key_values => [ { name => 'avg' }, { name => 'max' }, { name => 'min' } ], - threshold_use => $_->[0] . '_absolute', + threshold_use => $_->[0] , closure_custom_output => $self->can('custom_' . $type . '_latency_output'), perfdatas => [ - { value => $_->[0] . '_absolute', template => '%.3f', min => 0, unit => 's' }, + { value => $_->[0] , template => '%.3f', min => 0, unit => 's' }, ], } } @@ -223,10 +223,10 @@ sub set_counters { key_values => [ { name => 'up' }, { name => 'down' }, { name => 'unreach' } ], - threshold_use => $_->[0] . '_absolute', + threshold_use => $_->[0] , closure_custom_output => $self->can('custom_hosts_status_output'), perfdatas => [ - { value => $_->[0] . '_absolute', template => '%s', min => 0, max => 'total_absolute' }, + { value => $_->[0] , template => '%s', min => 0, max => 'total' }, ], } } @@ -244,10 +244,10 @@ sub set_counters { key_values => [ { name => 'ok' }, { name => 'warn' }, { name => 'unk' }, { name => 'crit' }, { name => 'total' } ], - threshold_use => $_->[0] . '_absolute', + threshold_use => $_->[0] , closure_custom_output => $self->can('custom_services_status_output'), perfdatas => [ - { value => $_->[0] . '_absolute', template => '%s', min => 0, max => 'total_absolute' }, + { value => $_->[0] , template => '%s', min => 0, max => 'total' }, ], } } @@ -265,10 +265,10 @@ sub set_counters { key_values => [ { name => 'current' }, { name => 'max' }, { name => 'total' } ], - threshold_use => $_->[0] . '_absolute', + threshold_use => $_->[0] , closure_custom_output => $self->can('custom_commands_buffer_output'), perfdatas => [ - { value => $_->[0] . '_absolute', template => '%s', min => 0, max => 'total_absolute' }, + { value => $_->[0] , template => '%s', min => 0, max => 'total' }, ], } } diff --git a/apps/centreon/map/jmx/mode/brokerstats.pm b/apps/centreon/map/jmx/mode/brokerstats.pm index 5ac20646e..5e8281e41 100644 --- a/apps/centreon/map/jmx/mode/brokerstats.pm +++ b/apps/centreon/map/jmx/mode/brokerstats.pm @@ -58,29 +58,27 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'received-packets-rate', set => { - key_values => [ { name => 'ReceivedPackets', diff => 1 } ], + key_values => [ { name => 'ReceivedPackets', per_second => 1 } ], output_template => 'Received Packets: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'received_packets_rate', value => 'ReceivedPackets_per_second', template => '%.2f', - min => 0, unit => 'packets/s' }, - ], + { label => 'received_packets_rate', template => '%.2f', + min => 0, unit => 'packets/s' } + ] } }, { label => 'processed-packets-rate', set => { - key_values => [ { name => 'ProcessedPackets', diff => 1 } ], + key_values => [ { name => 'ProcessedPackets', per_second => 1 } ], output_template => 'Processed Packets: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'processed_packets_rate', value => 'ProcessedPackets_per_second', template => '%.2f', + { label => 'processed_packets_rate', template => '%.2f', min => 0, unit => 'packets/s' }, - ], + ] } - }, + } ]; } @@ -89,12 +87,11 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters', default => '' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{processed_packets} < %{received_packets}' }, - }); + $options{options}->add_options(arguments => { + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{processed_packets} < %{received_packets}' } + }); + return $self; } diff --git a/apps/centreon/map/jmx/mode/enginestats.pm b/apps/centreon/map/jmx/mode/enginestats.pm index 968a7ed08..8408cb6a8 100644 --- a/apps/centreon/map/jmx/mode/enginestats.pm +++ b/apps/centreon/map/jmx/mode/enginestats.pm @@ -37,37 +37,34 @@ sub set_counters { key_values => [ { name => 'DrilldownCandidatesQueue' } ], output_template => 'Drilldown Canditates Queue: %d', perfdatas => [ - { label => 'drilldown_candidates_queue', value => 'DrilldownCandidatesQueue_absolute', template => '%d', + { label => 'drilldown_candidates_queue', template => '%d', min => 0 }, ], } }, { label => 'cutback-computation-rate', set => { - key_values => [ { name => 'Cutbackcomputation', diff => 1 } ], + key_values => [ { name => 'Cutbackcomputation', per_second => 1 } ], output_template => 'Cutback Computation: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'cutback_computation_rate', value => 'Cutbackcomputation_per_second', template => '%.2f', + { label => 'cutback_computation_rate', template => '%.2f', min => 0 }, ], } }, { label => 'minimal-computation-rate', set => { - key_values => [ { name => 'Minimalcomputation', diff => 1 } ], + key_values => [ { name => 'Minimalcomputation', per_second => 1 } ], output_template => 'Minimal Computation: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'minimal_computation_rate', value => 'Minimalcomputation_per_second', template => '%.2f', + { label => 'minimal_computation_rate', template => '%.2f', min => 0 }, ], } }, { label => 'recursive-computation-rate', set => { - key_values => [ { name => 'Recursivecomputation', diff => 1 } ], + key_values => [ { name => 'Recursivecomputation', per_second => 1 } ], output_template => 'Recursive Computation: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'recursive_computation_rate', value => 'Recursivecomputation_per_second', template => '%.2f', + { label => 'recursive_computation_rate', template => '%.2f', min => 0 }, ], } @@ -80,10 +77,9 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters', default => '' }, - }); + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/apps/centreon/map/jmx/mode/events.pm b/apps/centreon/map/jmx/mode/events.pm index 9dd3657d5..b293910b9 100644 --- a/apps/centreon/map/jmx/mode/events.pm +++ b/apps/centreon/map/jmx/mode/events.pm @@ -47,15 +47,14 @@ sub set_counters { $label =~ s/_/-/g; $output =~ s/_/ /g; my $entry = { label => $label . '-rate', set => { - key_values => [ { name => $counter, diff => 1 } ], - output_template => ucfirst($output) . ': %.2f/s', - per_second => 1, - perfdatas => [ - { label => $label_perf . '_rate', value => $counter . '_per_second', template => '%.2f', - min => 0, unit => '/s' }, - ], - } - }; + key_values => [ { name => $counter, per_second => 1 } ], + output_template => ucfirst($output) . ': %.2f/s', + perfdatas => [ + { label => $label_perf . '_rate', template => '%.2f', + min => 0, unit => '/s' } + ] + } + }; push @{$self->{maps_counters}->{global}}, $entry; } } @@ -65,10 +64,9 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters', default => '' }, - }); + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/apps/centreon/map/jmx/mode/openviews.pm b/apps/centreon/map/jmx/mode/openviews.pm index b6d6134be..69978a5eb 100644 --- a/apps/centreon/map/jmx/mode/openviews.pm +++ b/apps/centreon/map/jmx/mode/openviews.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'OpenContextCount' } ], output_template => 'Open Views: %d', perfdatas => [ - { label => 'open_views', value => 'OpenContextCount_absolute', template => '%d', + { label => 'open_views', value => 'OpenContextCount', template => '%d', min => 0, unit => 'views' }, ], } diff --git a/apps/centreon/map/jmx/mode/sessions.pm b/apps/centreon/map/jmx/mode/sessions.pm index 5595d0f2b..6560e7ae2 100644 --- a/apps/centreon/map/jmx/mode/sessions.pm +++ b/apps/centreon/map/jmx/mode/sessions.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'SessionCount' } ], output_template => 'Active Sessions: %d', perfdatas => [ - { label => 'active_sessions', value => 'SessionCount_absolute', template => '%d', + { label => 'active_sessions', value => 'SessionCount', template => '%d', min => 0, unit => 'sessions' }, ], } @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'AverageEventQueueSize' } ], output_template => 'Average Event Queue Size: %d', perfdatas => [ - { label => 'queue_size', value => 'AverageEventQueueSize_absolute', template => '%d', + { label => 'queue_size', value => 'AverageEventQueueSize', template => '%d', min => 0 }, ], } diff --git a/apps/centreon/map/jmx/mode/syncstats.pm b/apps/centreon/map/jmx/mode/syncstats.pm index ff067b518..d43031366 100644 --- a/apps/centreon/map/jmx/mode/syncstats.pm +++ b/apps/centreon/map/jmx/mode/syncstats.pm @@ -43,7 +43,7 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Count: %d', perfdatas => [ - { label => 'map.synchronization.centreon.count', value => 'count_absolute', template => '%d', + { label => 'map.synchronization.centreon.count', value => 'count', template => '%d', min => 0 }, ], } @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'average' } ], output_template => 'Average Duration: %.2f ms', perfdatas => [ - { label => 'map.synchronization.centreon.duration.average.milliseconds', value => 'average_absolute', + { label => 'map.synchronization.centreon.duration.average.milliseconds', value => 'average', template => '%.2f', min => 0, unit => 'ms' }, ], } @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'max' } ], output_template => 'Max Duration: %.2f ms', perfdatas => [ - { label => 'map.synchronization.centreon.duration.max.milliseconds', value => 'max_absolute', + { label => 'map.synchronization.centreon.duration.max.milliseconds', value => 'max', template => '%.2f', min => 0, unit => 'ms' }, ], } @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'count' }, { name => 'name' } ], output_template => 'Count: %d', perfdatas => [ - { label => 'map.synchronization.acl.count', value => 'count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'map.synchronization.acl.count', value => 'count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -85,8 +85,8 @@ sub set_counters { key_values => [ { name => 'average' }, { name => 'name' } ], output_template => 'Average Duration: %.2f ms', perfdatas => [ - { label => 'map.synchronization.acl.duration.average.milliseconds', value => 'average_absolute', - template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'map.synchronization.acl.duration.average.milliseconds', value => 'average', + template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -95,8 +95,8 @@ sub set_counters { key_values => [ { name => 'max' }, { name => 'name' } ], output_template => 'Max Duration: %.2f ms', perfdatas => [ - { label => 'map.synchronization.acl.duration.max.milliseconds', value => 'max_absolute', - template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'map.synchronization.acl.duration.max.milliseconds', value => 'max', + template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -107,8 +107,8 @@ sub set_counters { key_values => [ { name => 'count' }, { name => 'name' } ], output_template => 'Count: %d', perfdatas => [ - { label => 'map.synchronization.resource.count', value => 'count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'map.synchronization.resource.count', value => 'count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -117,8 +117,8 @@ sub set_counters { key_values => [ { name => 'average' }, { name => 'name' } ], output_template => 'Average Duration: %.2f ms', perfdatas => [ - { label => 'map.synchronization.resource.duration.average.milliseconds', value => 'average_absolute', - template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'map.synchronization.resource.duration.average.milliseconds', value => 'average', + template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -127,8 +127,8 @@ sub set_counters { key_values => [ { name => 'max' }, { name => 'name' } ], output_template => 'Max Duration: %.2f ms', perfdatas => [ - { label => 'map.synchronization.resource.duration.max.milliseconds', value => 'max_absolute', - template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'map.synchronization.resource.duration.max.milliseconds', value => 'max', + template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/apps/centreon/restapi/mode/submitresult.pm b/apps/centreon/restapi/mode/submitresult.pm index 0aa2e0ddf..1360da61c 100644 --- a/apps/centreon/restapi/mode/submitresult.pm +++ b/apps/centreon/restapi/mode/submitresult.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => '202' } ], output_template => '202: %d', perfdatas => [ - { value => '202_absolute', template => '%d', min => 0 }, + { value => '202', template => '%d', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => '400' } ], output_template => '400: %d', perfdatas => [ - { value => '400_absolute', template => '%d', min => 0 }, + { value => '400', template => '%d', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => '404' } ], output_template => '404: %d', perfdatas => [ - { value => '404_absolute', template => '%d', min => 0 }, + { value => '404', template => '%d', min => 0 }, ], } }, diff --git a/apps/centreon/sql/mode/countservices.pm b/apps/centreon/sql/mode/countservices.pm index 241d5f857..db037c81c 100644 --- a/apps/centreon/sql/mode/countservices.pm +++ b/apps/centreon/sql/mode/countservices.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'hosts' }, { name => 'display' } ], output_template => 'Number of hosts : %s', perfdatas => [ - { label => 'total_hosts', value => 'hosts_absolute', template => '%s', + { label => 'total_hosts', value => 'hosts', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'services' }, { name => 'display' } ], output_template => 'Number of services : %s', perfdatas => [ - { label => 'total_services', value => 'services_absolute', template => '%s', + { label => 'total_services', value => 'services', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/centreon/sql/mode/dsmqueue.pm b/apps/centreon/sql/mode/dsmqueue.pm index 73b0553ed..473733d31 100644 --- a/apps/centreon/sql/mode/dsmqueue.pm +++ b/apps/centreon/sql/mode/dsmqueue.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'total_queue_cache' } ], output_template => 'Total current cache queue : %s', perfdatas => [ - { label => 'total_queue_cache', value => 'total_queue_cache_absolute', template => '%s', min => 0 }, + { label => 'total_queue_cache', value => 'total_queue_cache', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'total_queue_lock' } ], output_template => 'Total current lock queue : %s', perfdatas => [ - { label => 'total_queue_lock', value => 'total_queue_lock_absolute', template => '%s', min => 0 }, + { label => 'total_queue_lock', value => 'total_queue_lock', template => '%s', min => 0 }, ], } }, @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'num' }, { name => 'display' } ], output_template => 'current cache queue : %s', perfdatas => [ - { label => 'host_queue_cache', value => 'num_absolute', template => '%s', + { label => 'host_queue_cache', value => 'num', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/centreon/sql/mode/pollerdelay.pm b/apps/centreon/sql/mode/pollerdelay.pm index 8d90ddff9..ce30e22b9 100644 --- a/apps/centreon/sql/mode/pollerdelay.pm +++ b/apps/centreon/sql/mode/pollerdelay.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'delay' }, { name => 'display' } ], output_template => 'delay for last update is %d seconds', perfdatas => [ - { label => 'delay', value => 'delay_absolute', template => '%s', + { label => 'delay', value => 'delay', template => '%s', unit => 's', label_extra_instance => 1 }, ], } diff --git a/apps/cisco/cms/restapi/mode/calls.pm b/apps/cisco/cms/restapi/mode/calls.pm index c2b3e6901..406f0735d 100644 --- a/apps/cisco/cms/restapi/mode/calls.pm +++ b/apps/cisco/cms/restapi/mode/calls.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'calls' } ], output_template => 'Active calls: %d', perfdatas => [ - { label => 'active_calls', value => 'calls_absolute', template => '%d', + { label => 'active_calls', value => 'calls', template => '%d', min => 0, unit => 'calls' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'numParticipantsLocal' } ], output_template => 'Local participants: %d', perfdatas => [ - { label => 'local_participants', value => 'numParticipantsLocal_absolute', template => '%d', + { label => 'local_participants', value => 'numParticipantsLocal', template => '%d', min => 0, unit => 'participants' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'numParticipantsRemote' } ], output_template => 'Remote participants: %d', perfdatas => [ - { label => 'remote_participants', value => 'numParticipantsRemote_absolute', template => '%d', + { label => 'remote_participants', value => 'numParticipantsRemote', template => '%d', min => 0, unit => 'participants' }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'numCallLegs' } ], output_template => 'Call legs: %d', perfdatas => [ - { label => 'call_legs', value => 'numCallLegs_absolute', template => '%d', + { label => 'call_legs', value => 'numCallLegs', template => '%d', min => 0, unit => 'legs' }, ], } diff --git a/apps/cisco/cms/restapi/mode/systemstatus.pm b/apps/cisco/cms/restapi/mode/systemstatus.pm index cf2f0bb84..980f476a8 100644 --- a/apps/cisco/cms/restapi/mode/systemstatus.pm +++ b/apps/cisco/cms/restapi/mode/systemstatus.pm @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'callLegsActive' } ], output_template => 'Active: %d', perfdatas => [ - { label => 'active_legs', value => 'callLegsActive_absolute', template => '%d', + { label => 'active_legs', value => 'callLegsActive', template => '%d', min => 0, unit => 'legs' }, ], } @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'callLegsCompleted' } ], output_template => 'Completed: %d', perfdatas => [ - { label => 'completed_legs', value => 'callLegsCompleted_absolute', template => '%d', + { label => 'completed_legs', value => 'callLegsCompleted', template => '%d', min => 0, unit => 'legs' }, ], } @@ -87,7 +87,7 @@ sub set_counters { output_template => 'outgoing audio streams: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'audio_outgoing_rate', value => 'audioBitRateOutgoing_absolute', template => '%d', + { label => 'audio_outgoing_rate', value => 'audioBitRateOutgoing', template => '%d', min => 0, unit => 'b/s' }, ], } @@ -97,7 +97,7 @@ sub set_counters { output_template => 'incoming audio streams: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'audio_incoming_rate', value => 'audioBitRateIncoming_absolute', template => '%d', + { label => 'audio_incoming_rate', value => 'audioBitRateIncoming', template => '%d', min => 0, unit => 'b/s' }, ], } @@ -107,7 +107,7 @@ sub set_counters { output_template => 'outgoing video streams: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'video_outgoing_rate', value => 'videoBitRateOutgoing_absolute', template => '%d', + { label => 'video_outgoing_rate', value => 'videoBitRateOutgoing', template => '%d', min => 0, unit => 'b/s' }, ], } @@ -117,7 +117,7 @@ sub set_counters { output_template => 'incoming video streams: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'video_incoming_rate', value => 'videoBitRateIncoming_absolute', template => '%d', + { label => 'video_incoming_rate', value => 'videoBitRateIncoming', template => '%d', min => 0, unit => 'b/s' }, ], } diff --git a/apps/cisco/ise/restapi/mode/session.pm b/apps/cisco/ise/restapi/mode/session.pm index 2e11c9622..1334706ed 100644 --- a/apps/cisco/ise/restapi/mode/session.pm +++ b/apps/cisco/ise/restapi/mode/session.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active sessions: %d', perfdatas => [ - { label => 'active_sessions', value => 'active_absolute', template => '%d', + { label => 'active_sessions', value => 'active', template => '%d', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'postured' } ], output_template => 'Postured endpoints: %d', perfdatas => [ - { label => 'postured_endpoints', value => 'postured_absolute', template => '%d', + { label => 'postured_endpoints', value => 'postured', template => '%d', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'profiler' } ], output_template => 'Profiler service sessions: %d', perfdatas => [ - { label => 'profiler_service_sessions', value => 'profiler_absolute', template => '%d', + { label => 'profiler_service_sessions', value => 'profiler', template => '%d', min => 0 }, ], } diff --git a/apps/citrix/local/mode/license.pm b/apps/citrix/local/mode/license.pm index bc6f84d0c..3db8f64d8 100644 --- a/apps/citrix/local/mode/license.pm +++ b/apps/citrix/local/mode/license.pm @@ -30,11 +30,11 @@ sub custom_license_output { my ($self, %options) = @_; my $msg = sprintf("Licenses Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", - $self->{result_values}->{total_absolute}, - $self->{result_values}->{used_absolute}, - $self->{result_values}->{prct_used_absolute}, - $self->{result_values}->{free_absolute}, - $self->{result_values}->{prct_free_absolute} + $self->{result_values}->{total}, + $self->{result_values}->{used}, + $self->{result_values}->{prct_used}, + $self->{result_values}->{free}, + $self->{result_values}->{prct_free} ); return $msg; } @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_license_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute' }, + { value => 'used', template => '%d', min => 0, max => 'total' }, ], } }, @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_license_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute' }, + { value => 'free', template => '%d', min => 0, max => 'total' }, ], } }, @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Licenses Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/apps/haproxy/snmp/mode/backendusage.pm b/apps/haproxy/snmp/mode/backendusage.pm index 8aabf6d51..470134b97 100644 --- a/apps/haproxy/snmp/mode/backendusage.pm +++ b/apps/haproxy/snmp/mode/backendusage.pm @@ -62,8 +62,8 @@ sub set_counters { key_values => [ { name => 'alBackendQueueCur' }, { name => 'display' } ], output_template => 'Current queue : %s', perfdatas => [ - { label => 'current_queue', value => 'alBackendQueueCur_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_queue', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -71,8 +71,8 @@ sub set_counters { key_values => [ { name => 'alBackendSessionCur' }, { name => 'display' } ], output_template => 'Current sessions : %s', perfdatas => [ - { label => 'current_sessions', value => 'alBackendSessionCur_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_sessions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -80,28 +80,28 @@ sub set_counters { key_values => [ { name => 'alBackendSessionTotal', diff => 1 }, { name => 'display' } ], output_template => 'Total sessions : %s', perfdatas => [ - { label => 'total_connections', value => 'alBackendSessionTotal_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'alBackendBytesIN', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'alBackendBytesIN', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'alBackendBytesIN_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'alBackendBytesOUT', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'alBackendBytesOUT', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'alBackendBytesOUT_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -114,9 +114,9 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - 'filter-name:s' => { name => 'filter_name' }, - 'warning-status:s' => { name => 'warning_status', default => '' }, - 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /UP/i' }, + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /UP/i' } }); return $self; diff --git a/apps/haproxy/snmp/mode/frontendusage.pm b/apps/haproxy/snmp/mode/frontendusage.pm index a4d361b25..5412372ea 100644 --- a/apps/haproxy/snmp/mode/frontendusage.pm +++ b/apps/haproxy/snmp/mode/frontendusage.pm @@ -46,7 +46,7 @@ sub set_counters { my ($self, %options) = @_; $self->{maps_counters_type} = [ - { name => 'frontend', type => 1, cb_prefix_output => 'prefix_frontend_output', message_multiple => 'All frontends are ok' }, + { name => 'frontend', type => 1, cb_prefix_output => 'prefix_frontend_output', message_multiple => 'All frontends are ok' } ]; $self->{maps_counters}->{frontend} = [ @@ -55,47 +55,47 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'current-sessions', set => { key_values => [ { name => 'alFrontendSessionCur' }, { name => 'display' } ], output_template => 'Current sessions : %s', perfdatas => [ - { label => 'current_sessions', value => 'alFrontendSessionCur_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'current_sessions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } }, { label => 'total-sessions', set => { key_values => [ { name => 'alFrontendSessionTotal', diff => 1 }, { name => 'display' } ], output_template => 'Total sessions : %s', perfdatas => [ - { label => 'total_connections', value => 'alFrontendSessionTotal_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'total_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } }, { label => 'traffic-in', set => { - key_values => [ { name => 'alFrontendBytesIN', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'alFrontendBytesIN', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'alFrontendBytesIN_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + ] } }, { label => 'traffic-out', set => { - key_values => [ { name => 'alFrontendBytesOUT', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'alFrontendBytesOUT', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'alFrontendBytesOUT_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, + ] } - }, + } ]; } @@ -105,9 +105,9 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} !~ /OPEN/i' }, + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /OPEN/i' } }); return $self; diff --git a/apps/hddtemp/mode/temperatures.pm b/apps/hddtemp/mode/temperatures.pm index 61f2e2d77..88adfceb7 100644 --- a/apps/hddtemp/mode/temperatures.pm +++ b/apps/hddtemp/mode/temperatures.pm @@ -39,8 +39,8 @@ sub custom_temperature_output { my ($self, %options) = @_; return sprintf('temperature: %s %s', - $self->{result_values}->{temperature_absolute}, - $self->{result_values}->{temperature_unit_absolute} + $self->{result_values}->{temperature}, + $self->{result_values}->{temperature_unit} ); } @@ -48,10 +48,10 @@ sub custom_temperature_perfdata { my ($self, %options) = @_; $self->{output}->perfdata_add( - nlabel => 'drive.temperature.' . ($self->{result_values}->{temperature_unit_absolute} eq 'C' ? 'celsius' : 'fahrenheit'), - instances => $self->{result_values}->{display_absolute}, - unit => $self->{result_values}->{temperature_unit_absolute}, - value => $self->{result_values}->{temperature_absolute}, + nlabel => 'drive.temperature.' . ($self->{result_values}->{temperature_unit} eq 'C' ? 'celsius' : 'fahrenheit'), + instances => $self->{result_values}->{display}, + unit => $self->{result_values}->{temperature_unit}, + value => $self->{result_values}->{temperature}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), ); diff --git a/apps/hyperv/2012/local/mode/nodesnapshot.pm b/apps/hyperv/2012/local/mode/nodesnapshot.pm index bb55bcdc7..0ddde6896 100644 --- a/apps/hyperv/2012/local/mode/nodesnapshot.pm +++ b/apps/hyperv/2012/local/mode/nodesnapshot.pm @@ -52,13 +52,13 @@ sub set_counters { sub custom_snapshot_output { my ($self, %options) = @_; - return "[status = " . $self->{result_values}->{status_absolute} . "] checkpoint started '" . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{snapshot_absolute}) . "' ago"; + return "[status = " . $self->{result_values}->{status} . "] checkpoint started '" . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{snapshot}) . "' ago"; } sub custom_backing_output { my ($self, %options) = @_; - return "[status = " . $self->{result_values}->{status_absolute} . "] backing started '" . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{backing_absolute}) . "' ago"; + return "[status = " . $self->{result_values}->{status} . "] backing started '" . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{backing}) . "' ago"; } sub prefix_vm_output { diff --git a/apps/hyperv/2012/local/mode/scvmmsnapshot.pm b/apps/hyperv/2012/local/mode/scvmmsnapshot.pm index eee3c8e57..cd575a184 100644 --- a/apps/hyperv/2012/local/mode/scvmmsnapshot.pm +++ b/apps/hyperv/2012/local/mode/scvmmsnapshot.pm @@ -46,7 +46,7 @@ sub set_counters { sub custom_vm_output { my ($self, %options) = @_; - return 'checkpoint started since : ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{snapshot_absolute}); + return 'checkpoint started since : ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{snapshot}); } sub prefix_vm_output { diff --git a/apps/inin/ig/snmp/mode/spanusage.pm b/apps/inin/ig/snmp/mode/spanusage.pm index 6dadbe115..c0d107650 100644 --- a/apps/inin/ig/snmp/mode/spanusage.pm +++ b/apps/inin/ig/snmp/mode/spanusage.pm @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => 'i3IgSpanInfoActiveChannels' }, { name => 'display' } ], output_template => 'Current Active Channels : %s', perfdatas => [ - { label => 'active_channels', value => 'i3IgSpanInfoActiveChannels_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'active_channels', value => 'i3IgSpanInfoActiveChannels', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/inin/ig/snmp/mode/stats.pm b/apps/inin/ig/snmp/mode/stats.pm index 4d7d05d1b..ef8df8cc4 100644 --- a/apps/inin/ig/snmp/mode/stats.pm +++ b/apps/inin/ig/snmp/mode/stats.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'SipActiveCallsCount' } ], output_template => 'SIP Current Active Calls : %s', perfdatas => [ - { label => 'sip_active_calls', value => 'SipActiveCallsCount_absolute', template => '%d', + { label => 'sip_active_calls', value => 'SipActiveCallsCount', template => '%d', min => 0 }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'TdmActiveCallsCount' } ], output_template => 'TDM Current Active Calls : %s', perfdatas => [ - { label => 'tdm_active_calls', value => 'TdmActiveCallsCount_absolute', template => '%d', + { label => 'tdm_active_calls', value => 'TdmActiveCallsCount', template => '%d', min => 0 }, ], } @@ -58,8 +58,8 @@ sub set_counters { key_values => [ { name => 'i3IgChannelGroupActiveCallsCount' }, { name => 'display' } ], output_template => 'Current Active Calls : %s', perfdatas => [ - { label => 'channel_group_active_calls', value => 'i3IgChannelGroupActiveCallsCount_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'channel_group_active_calls', value => 'i3IgChannelGroupActiveCallsCount', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/inin/mediaserver/snmp/mode/audioengineusage.pm b/apps/inin/mediaserver/snmp/mode/audioengineusage.pm index d03755f46..2a1d209a9 100644 --- a/apps/inin/mediaserver/snmp/mode/audioengineusage.pm +++ b/apps/inin/mediaserver/snmp/mode/audioengineusage.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'i3MsAudioEngineAverageLoad' }, { name => 'display' } ], output_template => 'Average Load : %s', perfdatas => [ - { label => 'load_avg', value => 'i3MsAudioEngineAverageLoad_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load_avg', value => 'i3MsAudioEngineAverageLoad', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'i3MsAudioEngineElementCount' }, { name => 'display' } ], output_template => 'Total active graph elements : %s', perfdatas => [ - { label => 'elem_count', value => 'i3MsAudioEngineElementCount_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'elem_count', value => 'i3MsAudioEngineElementCount', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/inin/mediaserver/snmp/mode/cmdsrvusage.pm b/apps/inin/mediaserver/snmp/mode/cmdsrvusage.pm index 78b465fb1..d11d97198 100644 --- a/apps/inin/mediaserver/snmp/mode/cmdsrvusage.pm +++ b/apps/inin/mediaserver/snmp/mode/cmdsrvusage.pm @@ -136,8 +136,8 @@ sub set_counters { key_values => [ { name => 'i3MsCmdSrvResourceCount' }, { name => 'display' } ], output_template => 'Resource Count : %s', perfdatas => [ - { label => 'resource_count', value => 'i3MsCmdSrvResourceCount_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'resource_count', value => 'i3MsCmdSrvResourceCount', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/inin/mediaserver/snmp/mode/memoryusage.pm b/apps/inin/mediaserver/snmp/mode/memoryusage.pm index d127f9758..9c6f87c6b 100644 --- a/apps/inin/mediaserver/snmp/mode/memoryusage.pm +++ b/apps/inin/mediaserver/snmp/mode/memoryusage.pm @@ -38,7 +38,7 @@ sub set_counters { output_template => 'Memory Used : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%s', + { label => 'used', value => 'used', template => '%s', unit => 'B', min => 0 }, ], } diff --git a/apps/java/hibernate/jmx/mode/stats.pm b/apps/java/hibernate/jmx/mode/stats.pm index 5f2089d49..3b28a8886 100644 --- a/apps/java/hibernate/jmx/mode/stats.pm +++ b/apps/java/hibernate/jmx/mode/stats.pm @@ -39,8 +39,8 @@ sub set_counters { key_values => [ { name => 'connect', diff => 1 }, { name => 'display' } ], output_template => 'Connect Count : %s', perfdatas => [ - { label => 'connect_count', value => 'connect_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'connect_count', value => 'connect', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => 'close', diff => 1 }, { name => 'display' } ], output_template => 'Close Count : %s', perfdatas => [ - { label => 'close_count', value => 'close_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'close_count', value => 'close', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -57,8 +57,8 @@ sub set_counters { key_values => [ { name => 'query', diff => 1 }, { name => 'display' } ], output_template => 'Query Count : %s', perfdatas => [ - { label => 'query_count', value => 'query_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'query_count', value => 'query', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -66,8 +66,8 @@ sub set_counters { key_values => [ { name => 'insert', diff => 1 }, { name => 'display' } ], output_template => 'Insert Count : %s', perfdatas => [ - { label => 'insert_count', value => 'insert_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'insert_count', value => 'insert', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'update', diff => 1 }, { name => 'display' } ], output_template => 'Update Count : %s', perfdatas => [ - { label => 'update_count', value => 'update_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'update_count', value => 'update', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/java/jboss/jmx/mode/datasourceusage.pm b/apps/java/jboss/jmx/mode/datasourceusage.pm index b143da831..5ff352517 100644 --- a/apps/java/jboss/jmx/mode/datasourceusage.pm +++ b/apps/java/jboss/jmx/mode/datasourceusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'ActiveCount' }, { name => 'display' } ], output_template => 'Current Active Connections : %s', perfdatas => [ - { label => 'active_con', value => 'ActiveCount_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'active_con', value => 'ActiveCount', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'AvailableCount' }, { name => 'display' } ], output_template => 'Current Available Connections : %s', perfdatas => [ - { label => 'available_con', value => 'AvailableCount_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'available_con', value => 'AvailableCount', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'InUseCount' }, { name => 'display' } ], output_template => 'Current In Use Connections : %s', perfdatas => [ - { label => 'in_use_con', value => 'InUseCount_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'in_use_con', value => 'InUseCount', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'CreatedCount', diff => 1 }, { name => 'display' } ], output_template => 'Created Connections : %s', perfdatas => [ - { label => 'created_con', value => 'CreatedCount_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'created_con', value => 'CreatedCount', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/java/kafka/jmx/mode/globalstats.pm b/apps/java/kafka/jmx/mode/globalstats.pm index ab7f7ce28..36d76430f 100644 --- a/apps/java/kafka/jmx/mode/globalstats.pm +++ b/apps/java/kafka/jmx/mode/globalstats.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'leader_count' } ], output_template => 'Leaders : %s', perfdatas => [ - { label => 'leader_count', value => 'leader_count_absolute', template => '%s', min => 0 }, + { label => 'leader_count', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'active_controller_count' } ], output_template => 'Active Controllers : %s', perfdatas => [ - { label => 'active_controller_count', value => 'active_controller_count_absolute', template => '%s', min => 0 }, + { label => 'active_controller_count', template => '%s', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'partition_count' } ], output_template => 'Partitions : %s', perfdatas => [ - { label => 'partition_count', value => 'partition_count_absolute', template => '%s', min => 0 }, + { label => 'partition_count', template => '%s', min => 0 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'offline_partitions_count' } ], output_template => 'Offline partitions : %s', perfdatas => [ - { label => 'offline_partitions_count', value => 'offline_partitions_count_absolute', template => '%s', + { label => 'offline_partitions_count', template => '%s', min => 0 }, ], } @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'under_replicated_partitions' } ], output_template => 'Under replicated partitions : %s', perfdatas => [ - { label => 'under_replicated_partitions', value => 'under_replicated_partitions_absolute', template => '%s', + { label => 'under_replicated_partitions', template => '%s', min => 0 }, ], } @@ -80,26 +80,26 @@ sub set_counters { key_values => [ { name => 'unclean_leader_elections', diff => 1 } ], output_template => 'Number of unclean leader elections : %s', perfdatas => [ - { label => 'unclean_leader_elections', value => 'unclean_leader_elections_absolute', template => '%s', min => 0 }, + { label => 'unclean_leader_elections', template => '%s', min => 0 }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 } ], + key_values => [ { name => 'traffic_in', per_second => 1 } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', + { label => 'traffic_in', template => '%.2f', min => 0, unit => 'b/s' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 } ], + key_values => [ { name => 'traffic_out', per_second => 1 } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', + { label => 'traffic_out', template => '%.2f', min => 0, unit => 'b/s' }, ], } @@ -108,7 +108,7 @@ sub set_counters { key_values => [ { name => 'total_fetch_requests', diff => 1 } ], output_template => 'Number of total fetch requests : %s', perfdatas => [ - { label => 'total_fetch_requests', value => 'total_fetch_requests_absolute', template => '%s', min => 0 }, + { label => 'total_fetch_requests', template => '%s', min => 0 }, ], } }, @@ -119,11 +119,10 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); - + + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/apps/java/solr/jmx/mode/cacheusage.pm b/apps/java/solr/jmx/mode/cacheusage.pm index 683fb3d1f..541421214 100644 --- a/apps/java/solr/jmx/mode/cacheusage.pm +++ b/apps/java/solr/jmx/mode/cacheusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'cumulative_evictions', diff => 1 }, { name => 'display' } ], output_template => 'Evictions Count : %s', perfdatas => [ - { label => 'evictions_count', value => 'cumulative_evictions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'evictions_count', value => 'cumulative_evictions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'cumulative_lookups', diff => 1 }, { name => 'display' } ], output_template => 'Lookups Count : %s', perfdatas => [ - { label => 'lookups_count', value => 'cumulative_lookups_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'lookups_count', value => 'cumulative_lookups', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'cumulative_inserts', diff => 1 }, { name => 'display' } ], output_template => 'Inserts Count : %s', perfdatas => [ - { label => 'inserts_count', value => 'cumulative_inserts_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'inserts_count', value => 'cumulative_inserts', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'cumulative_hits', diff => 1 }, { name => 'display' } ], output_template => 'Hits Count : %s', perfdatas => [ - { label => 'hits_count', value => 'cumulative_hits_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'hits_count', value => 'cumulative_hits', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/java/solr/jmx/mode/requesthandlerusage.pm b/apps/java/solr/jmx/mode/requesthandlerusage.pm index 244f703de..0ac5d4cd5 100644 --- a/apps/java/solr/jmx/mode/requesthandlerusage.pm +++ b/apps/java/solr/jmx/mode/requesthandlerusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => '15minRateRequestsPerSecond' }, { name => 'display' } ], output_template => '15min Rate Requests : %.7f/s', perfdatas => [ - { label => '15min_rate_requests', value => '15minRateRequestsPerSecond_absolute', template => '%.7f', - min => 0, unit => '/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => '15min_rate_requests', value => '15minRateRequestsPerSecond', template => '%.7f', + min => 0, unit => '/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'avgRequestsPerSecond' }, { name => 'display' } ], output_template => 'Average Requests : %.7f/s', perfdatas => [ - { label => 'avg_requests', value => 'avgRequestsPerSecond_absolute', template => '%.7f', - min => 0, unit => '/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_requests', value => 'avgRequestsPerSecond', template => '%.7f', + min => 0, unit => '/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'avgTimePerRequest' }, { name => 'display' } ], output_template => 'Average Time Per Request : %.3f ms', perfdatas => [ - { label => 'avg_time', value => 'avgTimePerRequest_absolute', template => '%.3f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_time', value => 'avgTimePerRequest', template => '%.3f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'requests', diff => 1 }, { name => 'display' } ], output_template => 'Requests Count : %s', perfdatas => [ - { label => 'requests_count', value => 'requests_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'requests_count', value => 'requests', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/java/weblogic/jmx/mode/workmanager.pm b/apps/java/weblogic/jmx/mode/workmanager.pm index c5f577331..a79238a87 100644 --- a/apps/java/weblogic/jmx/mode/workmanager.pm +++ b/apps/java/weblogic/jmx/mode/workmanager.pm @@ -60,8 +60,8 @@ sub set_counters { key_values => [ { name => 'completed', diff => 1 }, { name => 'display' } ], output_template => 'Requests completed : %s', perfdatas => [ - { label => 'request_completed', value => 'completed_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'request_completed', value => 'completed', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -69,8 +69,8 @@ sub set_counters { key_values => [ { name => 'pending' }, { name => 'display' } ], output_template => 'Requests pending : %s', perfdatas => [ - { label => 'request_pending', value => 'pending_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'request_pending', value => 'pending', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -78,8 +78,8 @@ sub set_counters { key_values => [ { name => 'stuck' }, { name => 'display' } ], output_template => 'Threads stuck : %s', perfdatas => [ - { label => 'thread_stuck', value => 'stuck_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'thread_stuck', value => 'stuck', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/java/zookeeper/jmx/mode/stats.pm b/apps/java/zookeeper/jmx/mode/stats.pm index 72f2f8470..a19d512c5 100644 --- a/apps/java/zookeeper/jmx/mode/stats.pm +++ b/apps/java/zookeeper/jmx/mode/stats.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'AvgRequestLatency' } ], output_template => 'Avg Request Latency : %s ms', perfdatas => [ - { label => 'avg_request_latency', value => 'AvgRequestLatency_absolute', template => '%s', + { label => 'avg_request_latency', value => 'AvgRequestLatency', template => '%s', min => 0, unit => 'ms' }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'MaxRequestLatency' } ], output_template => 'Max Request Latency : %s ms', perfdatas => [ - { label => 'max_request_latency', value => 'MaxRequestLatency_absolute', template => '%s', + { label => 'max_request_latency', value => 'MaxRequestLatency', template => '%s', min => 0, unit => 'ms' }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'OutstandingRequests' } ], output_template => 'Outstanding Requests : %s', perfdatas => [ - { label => 'outstanding_requests', value => 'OutstandingRequests_absolute', template => '%s', + { label => 'outstanding_requests', value => 'OutstandingRequests', template => '%s', min => 0 }, ], } @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'PacketsReceived', diff => 1 } ], output_template => 'Packets Received : %s', perfdatas => [ - { label => 'packets_received', value => 'PacketsReceived_absolute', template => '%s', + { label => 'packets_received', value => 'PacketsReceived', template => '%s', min => 0 }, ], } @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'PacketsSent', diff => 1 } ], output_template => 'Packets Sent : %s', perfdatas => [ - { label => 'packets_sent', value => 'PacketsSent_absolute', template => '%s', + { label => 'packets_sent', value => 'PacketsSent', template => '%s', min => 0 }, ], } @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'NumAliveConnections' } ], output_template => 'Num Alive Connections : %s', perfdatas => [ - { label => 'num_connections', value => 'NumAliveConnections_absolute', template => '%s', + { label => 'num_connections', value => 'NumAliveConnections', template => '%s', min => 0 }, ], } diff --git a/apps/kingdee/eas/mode/activeusers.pm b/apps/kingdee/eas/mode/activeusers.pm index fa8a4cc39..697587658 100644 --- a/apps/kingdee/eas/mode/activeusers.pm +++ b/apps/kingdee/eas/mode/activeusers.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total users active: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 }, + { value => 'total', template => '%s', min => 0 }, ], } } @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'users_' . $_ } ], output_template => '%s (' . $_ . ')', perfdatas => [ - { value => 'users_' . $_ . '_absolute', template => '%s', min => 0 }, + { value => 'users_' . $_ , template => '%s', min => 0 }, ], } }; diff --git a/apps/kingdee/eas/mode/classloading.pm b/apps/kingdee/eas/mode/classloading.pm index e63671476..d8bfcb356 100644 --- a/apps/kingdee/eas/mode/classloading.pm +++ b/apps/kingdee/eas/mode/classloading.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'loadedclass' } ], output_template => 'class loaded: %s', perfdatas => [ - { value => 'loadedclass_absolute', template => '%s', min => 0 }, + { value => 'loadedclass', template => '%s', min => 0 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'unloadedclass', diff => 1 } ], output_template => 'class unloaded: %s', perfdatas => [ - { value => 'unloadedclass_absolute', template => '%s', min => 0 }, + { value => 'unloadedclass', template => '%s', min => 0 }, ], } }, diff --git a/apps/kingdee/eas/mode/datasource.pm b/apps/kingdee/eas/mode/datasource.pm index 69dd3f0d8..9e2f51f25 100644 --- a/apps/kingdee/eas/mode/datasource.pm +++ b/apps/kingdee/eas/mode/datasource.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'init_pool_size' } ], output_template => 'pool initial size: %s', perfdatas => [ - { value => 'init_pool_size_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'init_pool_size', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'max_pool_size' } ], output_template => 'pool max size: %s', perfdatas => [ - { value => 'max_pool_size_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'max_pool_size', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'idle_timeout' } ], output_template => 'idle timeout: %s', perfdatas => [ - { value => 'idle_timeout_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'idle_timeout', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'active_conn_count' } ], output_template => 'connections active: %s', perfdatas => [ - { value => 'active_conn_count_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'active_conn_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'cur_conn_count' } ], output_template => 'connections current: %s', perfdatas => [ - { value => 'cur_conn_count_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'cur_conn_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'max_conn_count' } ], output_template => 'connections max: %s', perfdatas => [ - { value => 'max_conn_count_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'max_conn_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'create_count', diff => 1 } ], output_template => 'connections created: %s', perfdatas => [ - { value => 'create_count_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'create_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'close_count', diff => 1 } ], output_template => 'connections closed: %s', perfdatas => [ - { value => 'close_count_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'close_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, diff --git a/apps/kingdee/eas/mode/handlers.pm b/apps/kingdee/eas/mode/handlers.pm index bd28cbf10..103c2170d 100644 --- a/apps/kingdee/eas/mode/handlers.pm +++ b/apps/kingdee/eas/mode/handlers.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'maxthreads' } ], output_template => 'threads max: %s', perfdatas => [ - { value => 'maxthreads_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'maxthreads', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'minsparethreads' } ], output_template => 'threads spare min: %s', perfdatas => [ - { value => 'minsparethreads_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'minsparethreads', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'maxsparethreads' } ], output_template => 'threads spare max: %s', perfdatas => [ - { value => 'maxsparethreads_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'maxsparethreads', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'maxqueuesize' } ], output_template => 'max queue size: %s', perfdatas => [ - { value => 'maxqueuesize_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'maxqueuesize', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'idle_timeout' } ], output_template => 'idle timeout: %s', perfdatas => [ - { value => 'idle_timeout_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'idle_timeout', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'processedcount', diff => 1 } ], output_template => 'threads processed: %s', perfdatas => [ - { value => 'processedcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'processedcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'currentthreadcount' } ], output_template => 'threads current: %s', perfdatas => [ - { value => 'currentthreadcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'currentthreadcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'currentthreadcount' } ], output_template => 'threads current: %s', perfdatas => [ - { value => 'currentthreadcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'currentthreadcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -103,7 +103,7 @@ sub set_counters { key_values => [ { name => 'availablethreadcount' } ], output_template => 'threads available: %s', perfdatas => [ - { value => 'availablethreadcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'availablethreadcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -111,7 +111,7 @@ sub set_counters { key_values => [ { name => 'busythreadcount' } ], output_template => 'threads busy: %s', perfdatas => [ - { value => 'busythreadcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'busythreadcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -119,7 +119,7 @@ sub set_counters { key_values => [ { name => 'maxavailablethreadcount' } ], output_template => 'threads available max: %s', perfdatas => [ - { value => 'maxavailablethreadcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'maxavailablethreadcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -127,7 +127,7 @@ sub set_counters { key_values => [ { name => 'maxbusythreadcount' } ], output_template => 'threads busy max: %s', perfdatas => [ - { value => 'maxbusythreadcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'maxbusythreadcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -135,7 +135,7 @@ sub set_counters { key_values => [ { name => 'maxprocessedtime' } ], output_template => 'threads processed time max: %s ms', perfdatas => [ - { value => 'maxprocessedtime_absolute', template => '%s', min => 0, unit => 'ms', label_extra_instance => 1 }, + { value => 'maxprocessedtime', template => '%s', min => 0, unit => 'ms', label_extra_instance => 1 }, ], } }, @@ -143,7 +143,7 @@ sub set_counters { key_values => [ { name => 'createcount' } ], output_template => 'threads created: %s', perfdatas => [ - { value => 'createcount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'createcount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -151,7 +151,7 @@ sub set_counters { key_values => [ { name => 'destroycount' } ], output_template => 'threads destroyed: %s', perfdatas => [ - { value => 'destroycount_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'destroycount', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, diff --git a/apps/kingdee/eas/mode/ibmjvmgc.pm b/apps/kingdee/eas/mode/ibmjvmgc.pm index c2a6bdc4e..e4ed125e9 100644 --- a/apps/kingdee/eas/mode/ibmjvmgc.pm +++ b/apps/kingdee/eas/mode/ibmjvmgc.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'collection_count', diff => 1 } ], output_template => 'gc collection count: %s', perfdatas => [ - { value => 'collection_count_absolute', template => '%s', min => 0 }, + { value => 'collection_count', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'collection_time', diff => 1 } ], output_template => 'gc collection time: %s ms', perfdatas => [ - { value => 'collection_time_absolute', template => '%s', min => 0, unit => 'ms' }, + { value => 'collection_time', template => '%s', min => 0, unit => 'ms' }, ], } }, diff --git a/apps/kingdee/eas/mode/javaruntime.pm b/apps/kingdee/eas/mode/javaruntime.pm index 89d5f97af..d2153a8be 100644 --- a/apps/kingdee/eas/mode/javaruntime.pm +++ b/apps/kingdee/eas/mode/javaruntime.pm @@ -39,9 +39,9 @@ sub set_counters { { label => 'uptime', nlabel => 'java.uptime.milliseconds', set => { key_values => [ { name => 'uptime' }, { name => 'uptime_date' } ], output_template => 'java uptime: %s', - output_use => 'uptime_date_absolute', + output_use => 'uptime_date', perfdatas => [ - { value => 'uptime_absolute', template => '%s', + { value => 'uptime', template => '%s', unit => 'ms' }, ], } diff --git a/apps/kingdee/eas/mode/memory.pm b/apps/kingdee/eas/mode/memory.pm index bf88fec2e..cdd47c53d 100644 --- a/apps/kingdee/eas/mode/memory.pm +++ b/apps/kingdee/eas/mode/memory.pm @@ -42,7 +42,7 @@ sub set_counters { key_values => [ { name => $def->[0] } ], output_template => $def->[0] . ': %s', perfdatas => [ - { value => $def->[0] . '_absolute', template => '%s', min => 0 }, + { value => $def->[0] , template => '%s', min => 0 }, ], } }; diff --git a/apps/kingdee/eas/mode/oraclejvmgc.pm b/apps/kingdee/eas/mode/oraclejvmgc.pm index 5280ec003..89063553f 100644 --- a/apps/kingdee/eas/mode/oraclejvmgc.pm +++ b/apps/kingdee/eas/mode/oraclejvmgc.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'minor_gc_count', diff => 1 } ], output_template => 'minor count: %s', perfdatas => [ - { value => 'minor_gc_count_absolute', template => '%s', min => 0 }, + { value => 'minor_gc_count', template => '%s', min => 0 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'minor_gc_time', diff => 1 } ], output_template => 'minor time: %s ms', perfdatas => [ - { value => 'minor_gc_time_absolute', template => '%s', min => 0, unit => 'ms' }, + { value => 'minor_gc_time', template => '%s', min => 0, unit => 'ms' }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'full_gc_count', diff => 1 } ], output_template => 'full count: %s', perfdatas => [ - { value => 'full_gc_count_absolute', template => '%s', min => 0 }, + { value => 'full_gc_count', template => '%s', min => 0 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'full_gc_time', diff => 1 } ], output_template => 'full time: %s ms', perfdatas => [ - { value => 'full_gc_time_absolute', template => '%s', min => 0, unit => 'ms' }, + { value => 'full_gc_time', template => '%s', min => 0, unit => 'ms' }, ], } }, diff --git a/apps/kingdee/eas/mode/oracleksqltemptable.pm b/apps/kingdee/eas/mode/oracleksqltemptable.pm index 0411e646d..eb8c3fb4c 100644 --- a/apps/kingdee/eas/mode/oracleksqltemptable.pm +++ b/apps/kingdee/eas/mode/oracleksqltemptable.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'ksqltemp_count' } ], output_template => 'ksqltemp table: %s', perfdatas => [ - { value => 'ksqltemp_count_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'ksqltemp_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } } diff --git a/apps/kingdee/eas/mode/oraclerecyclebin.pm b/apps/kingdee/eas/mode/oraclerecyclebin.pm index b8adcf29b..5b4e6108b 100644 --- a/apps/kingdee/eas/mode/oraclerecyclebin.pm +++ b/apps/kingdee/eas/mode/oraclerecyclebin.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'recyclebin_count' } ], output_template => 'recyclebin table: %s', perfdatas => [ - { value => 'recyclebin_count_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'recyclebin_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } } diff --git a/apps/kingdee/eas/mode/oracleredolog.pm b/apps/kingdee/eas/mode/oracleredolog.pm index a5f37cdc6..019837ccb 100644 --- a/apps/kingdee/eas/mode/oracleredolog.pm +++ b/apps/kingdee/eas/mode/oracleredolog.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'inactive' } ], output_template => 'inactive: %s', perfdatas => [ - { value => 'inactive_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'inactive', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'active: %s', perfdatas => [ - { value => 'active_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'active', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'current: %s', perfdatas => [ - { value => 'current_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'current', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, diff --git a/apps/kingdee/eas/mode/oraclesession.pm b/apps/kingdee/eas/mode/oraclesession.pm index d85c28c9b..f115bf3fd 100644 --- a/apps/kingdee/eas/mode/oraclesession.pm +++ b/apps/kingdee/eas/mode/oraclesession.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'sessions active: %s', perfdatas => [ - { value => 'active_absolute', template => '%s', min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { value => 'active', template => '%s', min => 0, max => 'total', label_extra_instance => 1 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'inactive' } ], output_template => 'sessions inactive: %s', perfdatas => [ - { value => 'inactive_absolute', template => '%s', min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { value => 'inactive', template => '%s', min => 0, max => 'total', label_extra_instance => 1 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => $_ } ], output_template => 'wait class ' . $_ . ': %s', perfdatas => [ - { value => $_ . '_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => $_ , template => '%s', min => 0, label_extra_instance => 1 }, ], } }; diff --git a/apps/kingdee/eas/mode/oracletable.pm b/apps/kingdee/eas/mode/oracletable.pm index b2b96a6e6..64b70a07e 100644 --- a/apps/kingdee/eas/mode/oracletable.pm +++ b/apps/kingdee/eas/mode/oracletable.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'num_rows' } ], output_template => 'number of rows: %s', perfdatas => [ - { value => 'num_rows_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'num_rows', template => '%s', min => 0, label_extra_instance => 1 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'actual_num_rows' } ], output_template => 'number of actual rows: %s', perfdatas => [ - { value => 'actual_num_rows_absolute', template => '%s', min => 0, label_extra_instance => 1 }, + { value => 'actual_num_rows', template => '%s', min => 0, label_extra_instance => 1 }, ], } } diff --git a/apps/kingdee/eas/mode/ormrpc.pm b/apps/kingdee/eas/mode/ormrpc.pm index e0d0c6396..724bd0446 100644 --- a/apps/kingdee/eas/mode/ormrpc.pm +++ b/apps/kingdee/eas/mode/ormrpc.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'active_thread_count' } ], output_template => 'threads active: %s', perfdatas => [ - { value => 'active_thread_count_absolute', template => '%s', min => 0 }, + { value => 'active_thread_count', template => '%s', min => 0 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'stub_count' } ], output_template => 'stubs: %s', perfdatas => [ - { value => 'stub_count_absolute', template => '%s', min => 0 }, + { value => 'stub_count', template => '%s', min => 0 }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'proxy_count' } ], output_template => 'proxies: %s', perfdatas => [ - { value => 'proxy_count_absolute', template => '%s', min => 0 }, + { value => 'proxy_count', template => '%s', min => 0 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'client_session_count' } ], output_template => 'sessions client: %s', perfdatas => [ - { value => 'client_session_count_absolute', template => '%s', min => 0 }, + { value => 'client_session_count', template => '%s', min => 0 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'server_session_count' } ], output_template => 'sessions server: %s', perfdatas => [ - { value => 'server_session_count_absolute', template => '%s', min => 0 }, + { value => 'server_session_count', template => '%s', min => 0 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'client_invoke_count_per_minute' } ], output_template => 'clients invoke: %s/m', perfdatas => [ - { value => 'client_invoke_count_per_minute_absolute', template => '%s', min => 0, unit => '/m' }, + { value => 'client_invoke_count_per_minute', template => '%s', min => 0, unit => '/m' }, ], } }, @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'processed_service_count_per_minute' } ], output_template => 'processed service: %s/m', perfdatas => [ - { value => 'processed_service_count_per_minute_absolute', template => '%s', min => 0, unit => '/m' }, + { value => 'processed_service_count_per_minute', template => '%s', min => 0, unit => '/m' }, ], } }, @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'client_invoke_count', diff => 1 } ], output_template => 'clients invoked: %s', perfdatas => [ - { value => 'client_invoke_count_absolute', template => '%s', min => 0 }, + { value => 'client_invoke_count', template => '%s', min => 0 }, ], } }, @@ -103,7 +103,7 @@ sub set_counters { key_values => [ { name => 'processed_service_count', diff => 1 } ], output_template => 'processed service: %s', perfdatas => [ - { value => 'processed_service_count_absolute', template => '%s', min => 0 }, + { value => 'processed_service_count', template => '%s', min => 0 }, ], } }, diff --git a/apps/kingdee/eas/mode/transaction.pm b/apps/kingdee/eas/mode/transaction.pm index ebe57c101..4239367a3 100644 --- a/apps/kingdee/eas/mode/transaction.pm +++ b/apps/kingdee/eas/mode/transaction.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'active_count' } ], output_template => 'active: %s', perfdatas => [ - { value => 'active_count_absolute', template => '%s', min => 0 }, + { value => 'active_count', template => '%s', min => 0 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'timedout_count' } ], output_template => 'timed out: %s', perfdatas => [ - { value => 'timedout_count_absolute', template => '%s', min => 0 }, + { value => 'timedout_count', template => '%s', min => 0 }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'committed_count', diff => 1 } ], output_template => 'committed: %s', perfdatas => [ - { value => 'committed_count_absolute', template => '%s', min => 0 }, + { value => 'committed_count', template => '%s', min => 0 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'rolledback_count', diff => 1 } ], output_template => 'rolledback: %s', perfdatas => [ - { value => 'rolledback_count_absolute', template => '%s', min => 0 }, + { value => 'rolledback_count', template => '%s', min => 0 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'transaction_count', diff => 1 } ], output_template => 'created: %s', perfdatas => [ - { value => 'transaction_count_absolute', template => '%s', min => 0 }, + { value => 'transaction_count', template => '%s', min => 0 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'total_transaction_time', diff => 1 } ], output_template => 'total time: %s ms', perfdatas => [ - { value => 'total_transaction_time_absolute', template => '%s', min => 0, unit => 'ms' }, + { value => 'total_transaction_time', template => '%s', min => 0, unit => 'ms' }, ], } }, @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'max_transaction_time', diff => 1 } ], output_template => 'max time: %s ms', perfdatas => [ - { value => 'max_transaction_time_absolute', template => '%s', min => 0, unit => 'ms' }, + { value => 'max_transaction_time', template => '%s', min => 0, unit => 'ms' }, ], } }, @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'default_timeout' } ], output_template => 'default timeout: %s', perfdatas => [ - { value => 'default_timeout_absolute', template => '%s', min => 0 }, + { value => 'default_timeout', template => '%s', min => 0 }, ], } }, diff --git a/apps/lync/2013/mssql/mode/lyncusers.pm b/apps/lync/2013/mssql/mode/lyncusers.pm index 13c1c3eef..63f0ea6e0 100644 --- a/apps/lync/2013/mssql/mode/lyncusers.pm +++ b/apps/lync/2013/mssql/mode/lyncusers.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => '%d Total users', perfdatas => [ - { label => 'total_users', value => 'total_absolute', template => '%d', + { label => 'total_users', value => 'total', template => '%d', unit => 'users', min => 0, label_extra_instance => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'unique' } ], output_template => '%d Unique users', perfdatas => [ - { label => 'unique_users', value => 'unique_absolute', template => '%d', + { label => 'unique_users', value => 'unique', template => '%d', unit => 'users', min => 0, label_extra_instance => 0 }, ], } diff --git a/apps/monitoring/dynatrace/restapi/mode/problems.pm b/apps/monitoring/dynatrace/restapi/mode/problems.pm index de71f4f2d..ff275b0f6 100644 --- a/apps/monitoring/dynatrace/restapi/mode/problems.pm +++ b/apps/monitoring/dynatrace/restapi/mode/problems.pm @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'problems_open' } ], output_template => 'number of open problems : %s', perfdatas => [ - { value => 'problems_open_absolute', template => '%s', value => 'problems_open_absolute', min => 0 }, + { value => 'problems_open', template => '%s', value => 'problems_open', min => 0 }, ], } }, diff --git a/apps/monitoring/mip/restapi/mode/scenarios.pm b/apps/monitoring/mip/restapi/mode/scenarios.pm index b0994a27b..d46bc0eb8 100644 --- a/apps/monitoring/mip/restapi/mode/scenarios.pm +++ b/apps/monitoring/mip/restapi/mode/scenarios.pm @@ -47,20 +47,20 @@ sub custom_metric_output { my ($self, %options) = @_; my $msg; - if (defined($mapping_units->{ $self->{result_values}->{unit_absolute} }->{scale})) { + if (defined($mapping_units->{ $self->{result_values}->{unit} }->{scale})) { $msg = sprintf( 'value: %s %s%s', $self->{perfdata}->change_bytes( - value => $self->{result_values}->{value_absolute}, - network => $mapping_units->{ $self->{result_values}->{unit_absolute} }->{network} + value => $self->{result_values}->{value}, + network => $mapping_units->{ $self->{result_values}->{unit} }->{network} ), - $mapping_units->{ $self->{result_values}->{unit_absolute} }->{extra_unit} + $mapping_units->{ $self->{result_values}->{unit} }->{extra_unit} ); } else { $msg = sprintf( 'value: %s %s', - $self->{result_values}->{value_absolute}, - $self->{result_values}->{unit_absolute} + $self->{result_values}->{value}, + $self->{result_values}->{unit} ); } return $msg; @@ -70,10 +70,10 @@ sub custom_metric_perfdata { my ($self, %options) = @_; $self->{output}->perfdata_add( - unit => $self->{result_values}->{unit_absolute}, - nlabel => 'scenario.metric.usage.' . $mapping_units->{ $self->{result_values}->{unit_absolute} }->{label}, + unit => $self->{result_values}->{unit}, + nlabel => 'scenario.metric.usage.' . $mapping_units->{ $self->{result_values}->{unit} }->{label}, instances => $self->{instance}, - value => $self->{result_values}->{value_absolute}, + value => $self->{result_values}->{value}, ); } diff --git a/apps/monitoring/quanta/restapi/mode/webscenariosavailability.pm b/apps/monitoring/quanta/restapi/mode/webscenariosavailability.pm index a64be278b..f2561b50a 100644 --- a/apps/monitoring/quanta/restapi/mode/webscenariosavailability.pm +++ b/apps/monitoring/quanta/restapi/mode/webscenariosavailability.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'response_time' }, { name => 'display' } ], output_template => 'Total Response Time: %.3fs', perfdatas => [ - { value => 'response_time_absolute', template => '%.3f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'response_time', template => '%.3f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'availability' }, { name => 'display' } ], output_template => 'Availability: %.2f%%', perfdatas => [ - { value => 'availability_absolute', template => '%s', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'availability', template => '%s', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'avg_step_response_time' }, { name => 'display' } ], output_template => 'Step Average Response Time: %.3fs', perfdatas => [ - { value => 'avg_step_response_time_absolute', template => '%.3f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'avg_step_response_time', template => '%.3f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/monitoring/scom/restapi/mode/alerts.pm b/apps/monitoring/scom/restapi/mode/alerts.pm index d7f697bec..20ed9f801 100644 --- a/apps/monitoring/scom/restapi/mode/alerts.pm +++ b/apps/monitoring/scom/restapi/mode/alerts.pm @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => $_ } ], output_template => $_ . ': %s', perfdatas => [ - { value => $_ . '_absolute', template => '%s', min => 0 }, + { value => $_ , template => '%s', min => 0 }, ], } }; diff --git a/apps/mq/activemq/jmx/mode/brokers.pm b/apps/mq/activemq/jmx/mode/brokers.pm index 7072d4500..714209643 100644 --- a/apps/mq/activemq/jmx/mode/brokers.pm +++ b/apps/mq/activemq/jmx/mode/brokers.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'StorePercentUsage' }, { name => 'display' } ], output_template => 'store usage: %.2f %%', perfdatas => [ - { value => 'StorePercentUsage_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } + { value => 'StorePercentUsage', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } ] } }, @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'TempPercentUsage' }, { name => 'display' } ], output_template => 'temporary usage: %.2f %%', perfdatas => [ - { value => 'TempPercentUsage_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } + { value => 'TempPercentUsage', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } ] } }, @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'MemoryPercentUsage' }, { name => 'display' } ], output_template => 'memory usage: %.2f %%', perfdatas => [ - { value => 'MemoryPercentUsage_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } + { value => 'MemoryPercentUsage', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } ] } } @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'AverageEnqueueTime' }, { name => 'display' } ], output_template => 'average time messages remained enqueued: %.3f ms', perfdatas => [ - { value => 'AverageEnqueueTime_absolute', + { value => 'AverageEnqueueTime', template => '%.3f', unit => 'ms', min => 0, label_extra_instance => 1 } ] } @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'ConsumerCount' }, { name => 'display' } ], output_template => 'consumers connected: %s', perfdatas => [ - { value => 'ConsumerCount_absolute', + { value => 'ConsumerCount', template => '%s', min => 0, label_extra_instance => 1 } ] } @@ -90,7 +90,7 @@ sub set_counters { key_values => [ { name => 'ProducerCount' }, { name => 'display' } ], output_template => 'producers connected: %s', perfdatas => [ - { value => 'ProducerCount_absolute', + { value => 'ProducerCount', template => '%s', min => 0, label_extra_instance => 1 } ] } @@ -99,7 +99,7 @@ sub set_counters { key_values => [ { name => 'MemoryPercentUsage' }, { name => 'display' } ], output_template => 'memory usage: %.2f %%', perfdatas => [ - { value => 'MemoryPercentUsage_absolute', + { value => 'MemoryPercentUsage', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } ] } @@ -108,7 +108,7 @@ sub set_counters { key_values => [ { name => 'QueueSize' }, { name => 'display' } ], output_template => 'queue size: %s', perfdatas => [ - { value => 'QueueSize_absolute', + { value => 'QueueSize', template => '%s', min => 0, label_extra_instance => 1 } ] } @@ -117,7 +117,7 @@ sub set_counters { key_values => [ { name => 'EnqueueCount', diff => 1 }, { name => 'display' } ], output_template => 'messages enqueued: %s', perfdatas => [ - { value => 'EnqueueCount_absolute', + { value => 'EnqueueCount', template => '%s', min => 0, label_extra_instance => 1 } ] } @@ -126,7 +126,7 @@ sub set_counters { key_values => [ { name => 'DequeueCount', diff => 1 }, { name => 'display' } ], output_template => 'messages dequeued: %s', perfdatas => [ - { value => 'DequeueCount_absolute', + { value => 'DequeueCount', template => '%s', min => 0, label_extra_instance => 1 } ] } @@ -135,7 +135,7 @@ sub set_counters { key_values => [ { name => 'ExpiredCount', diff => 1 }, { name => 'display' } ], output_template => 'messages expired: %s', perfdatas => [ - { value => 'ExpiredCount_absolute', + { value => 'ExpiredCount', template => '%s', min => 0, label_extra_instance => 1 } ] } @@ -144,7 +144,7 @@ sub set_counters { key_values => [ { name => 'InFlightCount', diff => 1 }, { name => 'display' } ], output_template => 'messages in-flighted: %s', perfdatas => [ - { value => 'InFlightCount_absolute', + { value => 'InFlightCount', template => '%s', min => 0, label_extra_instance => 1 } ] } @@ -154,7 +154,7 @@ sub set_counters { output_template => 'average messages size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'AverageMessageSize_absolute', + { value => 'AverageMessageSize', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 } ] } diff --git a/apps/mq/ibmmq/mqi/mode/channels.pm b/apps/mq/ibmmq/mqi/mode/channels.pm index a0b9c5ed6..9fbd788d3 100644 --- a/apps/mq/ibmmq/mqi/mode/channels.pm +++ b/apps/mq/ibmmq/mqi/mode/channels.pm @@ -42,8 +42,8 @@ sub custom_traffic_in_perfdata { $self->{output}->perfdata_add( nlabel => $self->{nlabel}, unit => 'b/s', - instances => [$self->{result_values}->{qmgr_name_absolute}, $self->{result_values}->{channel_name_absolute}], - value => $self->{result_values}->{traffic_in_per_second}, + instances => [$self->{result_values}->{qmgr_name}, $self->{result_values}->{channel_name}], + value => $self->{result_values}->{traffic_in}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 @@ -55,8 +55,8 @@ sub custom_traffic_out_perfdata { $self->{output}->perfdata_add( nlabel => $self->{nlabel}, unit => 'b/s', - instances => [$self->{result_values}->{qmgr_name_absolute}, $self->{result_values}->{channel_name_absolute}], - value => $self->{result_values}->{traffic_out_per_second}, + instances => [$self->{result_values}->{qmgr_name}, $self->{result_values}->{channel_name}], + value => $self->{result_values}->{traffic_out}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 @@ -89,16 +89,16 @@ sub set_counters { } }, { label => 'traffic-in', nlabel => 'channel.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'qmgr_name' }, { name => 'channel_name' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'qmgr_name' }, { name => 'channel_name' } ], output_template => 'traffic in: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, closure_custom_perfdata => $self->can('custom_traffic_in_perfdata') } }, { label => 'traffic-out', nlabel => 'channel.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'qmgr_name' }, { name => 'channel_name' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'qmgr_name' }, { name => 'channel_name' } ], output_template => 'traffic out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, closure_custom_perfdata => $self->can('custom_traffic_out_perfdata') } } @@ -115,8 +115,9 @@ sub new { 'filter-type:s' => { name => 'filter_type' }, 'unknown-status:s' => { name => 'unknown_status', default => '' }, 'warning-status:s' => { name => 'warning_status', default => '' }, - 'critical-status:s' => { name => 'critical_status', default => '%{channel_status} !~ /running|idle/i' }, + 'critical-status:s' => { name => 'critical_status', default => '%{channel_status} !~ /running|idle/i' } }); + return $self; } @@ -174,7 +175,7 @@ sub manage_selection { } } - $self->{cache_name} = "ibmmq_" . $self->{mode} . '_' . $options{custom}->get_hostname() . '_' . $options{custom}->get_port() . '_' . + $self->{cache_name} = 'ibmmq_' . $self->{mode} . '_' . $options{custom}->get_hostname() . '_' . $options{custom}->get_port() . '_' . (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')); } diff --git a/apps/mq/ibmmq/mqi/mode/queuemanager.pm b/apps/mq/ibmmq/mqi/mode/queuemanager.pm index debadbdf5..23381b20e 100644 --- a/apps/mq/ibmmq/mqi/mode/queuemanager.pm +++ b/apps/mq/ibmmq/mqi/mode/queuemanager.pm @@ -42,8 +42,8 @@ sub custom_connections_perfdata { $self->{output}->perfdata_add( nlabel => $self->{nlabel}, - instances => $self->{result_values}->{display_absolute}, - value => $self->{result_values}->{connection_count_absolute}, + instances => $self->{result_values}->{display}, + value => $self->{result_values}->{connection_count}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 diff --git a/apps/mq/ibmmq/mqi/mode/queues.pm b/apps/mq/ibmmq/mqi/mode/queues.pm index c566d99d1..11384b2b6 100644 --- a/apps/mq/ibmmq/mqi/mode/queues.pm +++ b/apps/mq/ibmmq/mqi/mode/queues.pm @@ -31,7 +31,7 @@ sub custom_oldest_output { return sprintf( 'oldest message: %s', - centreon::plugins::misc::change_seconds(value => $self->{result_values}->{oldest_msg_age_absolute}) + centreon::plugins::misc::change_seconds(value => $self->{result_values}->{oldest_msg_age}) ); } @@ -40,8 +40,8 @@ sub custom_connections_perfdata { $self->{output}->perfdata_add( nlabel => $self->{nlabel}, - instances => [$self->{result_values}->{qmgr_name_absolute}, $self->{result_values}->{queue_name_absolute}], - value => $self->{result_values}->{open_input_count_absolute}, + instances => [$self->{result_values}->{qmgr_name}, $self->{result_values}->{queue_name}], + value => $self->{result_values}->{open_input_count}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 @@ -53,8 +53,8 @@ sub custom_qdepth_perfdata { $self->{output}->perfdata_add( nlabel => $self->{nlabel}, - instances => [$self->{result_values}->{qmgr_name_absolute}, $self->{result_values}->{queue_name_absolute}], - value => $self->{result_values}->{current_qdepth_absolute}, + instances => [$self->{result_values}->{qmgr_name}, $self->{result_values}->{queue_name}], + value => $self->{result_values}->{current_qdepth}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 @@ -66,8 +66,8 @@ sub custom_oldest_perfdata { $self->{output}->perfdata_add( nlabel => $self->{nlabel}, - instances => [$self->{result_values}->{qmgr_name_absolute}, $self->{result_values}->{queue_name_absolute}], - value => $self->{result_values}->{oldest_msg_age_absolute}, + instances => [$self->{result_values}->{qmgr_name}, $self->{result_values}->{queue_name}], + value => $self->{result_values}->{oldest_msg_age}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 diff --git a/apps/mq/rabbitmq/restapi/mode/nodeusage.pm b/apps/mq/rabbitmq/restapi/mode/nodeusage.pm index ff2c46849..901988ba0 100644 --- a/apps/mq/rabbitmq/restapi/mode/nodeusage.pm +++ b/apps/mq/rabbitmq/restapi/mode/nodeusage.pm @@ -51,25 +51,23 @@ sub set_counters { } }, { label => 'read', nlabel => 'node.io.read.usage.bytespersecond', set => { - key_values => [ { name => 'io_read_bytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'io_read_bytes', per_second => 1 }, { name => 'display' } ], output_template => 'read i/o : %s %s/s', - per_second => 1, output_change_bytes => 1, + output_change_bytes => 1, perfdatas => [ - { value => 'io_read_bytes_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } }, { label => 'write', nlabel => 'node.io.write.usage.bytespersecond', set => { - key_values => [ { name => 'io_write_bytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'io_write_bytes', per_second => 1 }, { name => 'display' } ], output_template => 'write i/o : %s %s/s', - per_second => 1, output_change_bytes => 1, + output_change_bytes => 1, perfdatas => [ - { value => 'io_write_bytes_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } - }, + } ]; } diff --git a/apps/mq/rabbitmq/restapi/mode/queueusage.pm b/apps/mq/rabbitmq/restapi/mode/queueusage.pm index 798cf49db..bc67e3f3c 100644 --- a/apps/mq/rabbitmq/restapi/mode/queueusage.pm +++ b/apps/mq/rabbitmq/restapi/mode/queueusage.pm @@ -54,8 +54,8 @@ sub set_counters { key_values => [ { name => 'queue_messages' }, { name => 'display' } ], output_template => 'current queue messages : %s', perfdatas => [ - { label => 'queue_msg', value => 'queue_messages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'queue_msg', value => 'queue_messages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -63,8 +63,8 @@ sub set_counters { key_values => [ { name => 'queue_messages_ready' }, { name => 'display' } ], output_template => 'current queue messages ready : %s', perfdatas => [ - { label => 'queue_msg_ready', value => 'queue_messages_ready_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'queue_msg_ready', value => 'queue_messages_ready', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/mq/rabbitmq/restapi/mode/systemusage.pm b/apps/mq/rabbitmq/restapi/mode/systemusage.pm index 2b611a9f3..67f7a08ea 100644 --- a/apps/mq/rabbitmq/restapi/mode/systemusage.pm +++ b/apps/mq/rabbitmq/restapi/mode/systemusage.pm @@ -38,49 +38,42 @@ sub set_counters { key_values => [ { name => 'queue_messages' } ], output_template => 'current queue messages : %s', perfdatas => [ - { label => 'queue_msg', value => 'queue_messages_absolute', template => '%d', - min => 0 }, - ], + { template => '%d', min => 0 } + ] } }, { label => 'queue-msg-ready', nlabel => 'system.queue.messages.ready.count', set => { key_values => [ { name => 'queue_messages_ready' } ], output_template => 'current queue messages ready : %s', perfdatas => [ - { label => 'queue_msg_ready', value => 'queue_messages_ready_absolute', template => '%d', - min => 0 }, - ], + { template => '%d', min => 0 } + ] } }, { label => 'db-event-queue', nlabel => 'system.db.event.queue.count', set => { key_values => [ { name => 'db_event_queue' } ], output_template => 'db event queue : %s', perfdatas => [ - { label => 'db_event_queue', value => 'db_event_queue_absolute', template => '%d', - min => 0 }, - ], + { template => '%d', min => 0 } + ] } }, { label => 'disk-read-iops', nlabel => 'system.disk.read.usage.iops', set => { - key_values => [ { name => 'disk_reads', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'disk_reads', per_second => 1 } ], output_template => 'disk reads iops : %s', perfdatas => [ - { label => 'disk_reads', value => 'disk_reads_per_second', template => '%d', - unit => 'iops', min => 0, }, - ], + { template => '%d', unit => 'iops', min => 0 } + ] } }, { label => 'disk-write-iops', nlabel => 'system.disk.write.usage.iops', set => { - key_values => [ { name => 'disk_writes', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'disk_writes', per_second => 1 } ], output_template => 'disk writes iops : %s', perfdatas => [ - { label => 'disk_writes', value => 'disk_writes_per_second', template => '%d', - unit => 'iops', min => 0, }, - ], + { template => '%d', unit => 'iops', min => 0 } + ] } - }, + } ]; } @@ -91,6 +84,7 @@ sub new { $options{options}->add_options(arguments => { }); + return $self; } diff --git a/apps/mq/rabbitmq/restapi/mode/vhostusage.pm b/apps/mq/rabbitmq/restapi/mode/vhostusage.pm index f00d5ea0f..8877cfbd5 100644 --- a/apps/mq/rabbitmq/restapi/mode/vhostusage.pm +++ b/apps/mq/rabbitmq/restapi/mode/vhostusage.pm @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'queue_messages' }, { name => 'display' } ], output_template => 'current queue messages : %s', perfdatas => [ - { label => 'queue_msg', value => 'queue_messages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'queue_msg', value => 'queue_messages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -64,8 +64,8 @@ sub set_counters { key_values => [ { name => 'queue_messages_ready' }, { name => 'display' } ], output_template => 'current queue messages ready : %s', perfdatas => [ - { label => 'queue_msg_ready', value => 'queue_messages_ready_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'queue_msg_ready', value => 'queue_messages_ready', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/mq/vernemq/restapi/mode/clusters.pm b/apps/mq/vernemq/restapi/mode/clusters.pm index 0dc8c8618..06b70aa84 100644 --- a/apps/mq/vernemq/restapi/mode/clusters.pm +++ b/apps/mq/vernemq/restapi/mode/clusters.pm @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'running' } ], output_template => 'current clusters running: %s', perfdatas => [ - { value => 'running_absolute', template => '%s', min => 0 } + { value => 'running', template => '%s', min => 0 } ] } }, @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'notrunning' } ], output_template => 'current clusters not running: %s', perfdatas => [ - { value => 'notrunning_absolute', template => '%s', min => 0 } + { value => 'notrunning', template => '%s', min => 0 } ] } } diff --git a/apps/mq/vernemq/restapi/mode/listeners.pm b/apps/mq/vernemq/restapi/mode/listeners.pm index 8da916ebe..136647c8d 100644 --- a/apps/mq/vernemq/restapi/mode/listeners.pm +++ b/apps/mq/vernemq/restapi/mode/listeners.pm @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'running' } ], output_template => 'current listeners running: %s', perfdatas => [ - { value => 'running_absolute', template => '%s', min => 0 } + { value => 'running', template => '%s', min => 0 } ] } }, @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'notrunning' } ], output_template => 'current listeners not running: %s', perfdatas => [ - { value => 'notrunning_absolute', template => '%s', min => 0 } + { value => 'notrunning', template => '%s', min => 0 } ] } } diff --git a/apps/mq/vernemq/restapi/mode/plugins.pm b/apps/mq/vernemq/restapi/mode/plugins.pm index ad1919677..6a5515f14 100644 --- a/apps/mq/vernemq/restapi/mode/plugins.pm +++ b/apps/mq/vernemq/restapi/mode/plugins.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'current total plugins: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 } + { value => 'total', template => '%s', min => 0 } ] } } diff --git a/apps/mq/vernemq/restapi/mode/sessions.pm b/apps/mq/vernemq/restapi/mode/sessions.pm index d3f2cdde7..e0572bc4a 100644 --- a/apps/mq/vernemq/restapi/mode/sessions.pm +++ b/apps/mq/vernemq/restapi/mode/sessions.pm @@ -43,7 +43,7 @@ sub set_counters { key_values => [ { name => 'online' } ], output_template => 'current online: %s', perfdatas => [ - { value => 'online_absolute', template => '%s', min => 0 } + { value => 'online', template => '%s', min => 0 } ] } }, @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'current total: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 } + { value => 'total', template => '%s', min => 0 } ] } } diff --git a/apps/mulesoft/restapi/mode/applications.pm b/apps/mulesoft/restapi/mode/applications.pm index e12a8d173..58e1bb98a 100644 --- a/apps/mulesoft/restapi/mode/applications.pm +++ b/apps/mulesoft/restapi/mode/applications.pm @@ -44,25 +44,25 @@ sub set_counters { { label => 'total', nlabel => 'mulesoft.applications.total.count', set => { key_values => [ { name => 'total' } ], output_template => "Total : %s", - perfdatas => [ { value => 'total_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'total', template => '%d', min => 0 } ] } }, { label => 'started', nlabel => 'mulesoft.applications.status.started.count', set => { key_values => [ { name => 'started' } ], output_template => "Started : %s", - perfdatas => [ { value => 'started_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'started', template => '%d', min => 0 } ] } }, { label => 'stopped', nlabel => 'mulesoft.applications.status.stopped.count', set => { key_values => [ { name => 'stopped' } ], output_template => "Stopped : %s", - perfdatas => [ { value => 'stopped_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'stopped', template => '%d', min => 0 } ] } }, { label => 'failed', nlabel => 'mulesoft.applications.status.failed.count', set => { key_values => [ { name => 'failed' } ], output_template => "Failed : %s", - perfdatas => [ { value => 'failed_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'failed', template => '%d', min => 0 } ] } } ]; diff --git a/apps/mulesoft/restapi/mode/clusters.pm b/apps/mulesoft/restapi/mode/clusters.pm index 5f1cfef53..e5c955b2e 100644 --- a/apps/mulesoft/restapi/mode/clusters.pm +++ b/apps/mulesoft/restapi/mode/clusters.pm @@ -50,19 +50,19 @@ sub set_counters { { label => 'total', nlabel => 'mulesoft.clusters.total.count', set => { key_values => [ { name => 'total' } ], output_template => "Total : %s", - perfdatas => [ { value => 'total_absolute', template => '%d', min => 0 } ], + perfdatas => [ { value => 'total', template => '%d', min => 0 } ], } }, { label => 'running', nlabel => 'mulesoft.clusters.status.running.count', set => { key_values => [ { name => 'running' } ], output_template => "Running : %s", - perfdatas => [ { value => 'running_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'running', template => '%d', min => 0 } ] } }, { label => 'disconnected', nlabel => 'mulesoft.clusters.status.disconnected.count', set => { key_values => [ { name => 'disconnected' } ], output_template => "Disconnected : %s", - perfdatas => [ { value => 'disconnected_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'disconnected', template => '%d', min => 0 } ] } } ]; diff --git a/apps/mulesoft/restapi/mode/servers.pm b/apps/mulesoft/restapi/mode/servers.pm index a3db2385d..f6ead952b 100644 --- a/apps/mulesoft/restapi/mode/servers.pm +++ b/apps/mulesoft/restapi/mode/servers.pm @@ -43,19 +43,19 @@ sub set_counters { { label => 'total', nlabel => 'mulesoft.servers.total.count', set => { key_values => [ { name => 'total' } ], output_template => 'Total : %s', - perfdatas => [ { value => 'total_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'total', template => '%d', min => 0 } ] } }, { label => 'running', nlabel => 'mulesoft.servers.status.running.count', set => { key_values => [ { name => 'running' } ], output_template => 'Running : %s', - perfdatas => [ { value => 'running_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'running', template => '%d', min => 0 } ] } }, { label => 'disconnected', nlabel => 'mulesoft.servers.status.disconnected.count', set => { key_values => [ { name => 'disconnected' } ], output_template => 'Disconnected : %s', - perfdatas => [ { value => 'disconnected_absolute', template => '%d', min => 0 } ] + perfdatas => [ { value => 'disconnected', template => '%d', min => 0 } ] } } ]; diff --git a/apps/openldap/ldap/mode/systemusage.pm b/apps/openldap/ldap/mode/systemusage.pm index 430864a30..78e1bd0cd 100644 --- a/apps/openldap/ldap/mode/systemusage.pm +++ b/apps/openldap/ldap/mode/systemusage.pm @@ -42,9 +42,8 @@ sub set_counters { key_values => [ { name => 'operations_completed_' . $_, diff => 1 } ], output_template => $_ . ' %s', perfdatas => [ - { label => 'operations_' . $_, value => 'operations_completed_' . $_ . '_absolute', template => '%.2f', - min => 0 }, - ], + { label => 'operations_' . $_, template => '%.2f', min => 0 } + ] } }; } @@ -55,8 +54,7 @@ sub set_counters { key_values => [ { name => 'connections_current' } ], output_template => 'Current connections %s', perfdatas => [ - { label => 'connections_current', value => 'connections_current_absolute', template => '%s', - min => 0 }, + { label => 'connections_current', template => '%s', min => 0 }, ], } }, @@ -64,8 +62,7 @@ sub set_counters { key_values => [ { name => 'connections_total', diff => 1 } ], output_template => 'Total connections %s', perfdatas => [ - { label => 'connections_total', value => 'connections_total_absolute', template => '%s', - min => 0 }, + { label => 'connections_total', template => '%s', min => 0 }, ], } }, @@ -73,21 +70,19 @@ sub set_counters { key_values => [ { name => 'threads_active_prct' } ], output_template => 'Current active threads %.2f %%', perfdatas => [ - { label => 'threads_active', value => 'threads_active_prct_absolute', template => '%.2f', - min => 0, max => 100, unit => '%' }, + { label => 'threads_active', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, { label => 'traffic', nlabel => 'system.traffic.bytespersecond', set => { - key_values => [ { name => 'traffic', diff => 1 } ], - output_change_bytes => 1, per_second => 1, + key_values => [ { name => 'traffic', per_second => 1 } ], output_template => 'traffic %s %s/s', + output_change_bytes => 1, perfdatas => [ - { label => 'traffic', value => 'traffic_per_second', template => '%s', - min => 0, unit => 'B/s', cast_int => 1 }, - ], + { label => 'traffic', template => '%s', min => 0, unit => 'B/s', cast_int => 1 }, + ] } - }, + } ]; } @@ -109,11 +104,11 @@ sub new { 'ldap-starttls-options:s@' => { name => 'ldap_starttls_options' }, 'ldap-bind-options:s@' => { name => 'ldap_bind_options' }, 'tls' => { name => 'use_tls' }, - 'username:s' => { name => 'username' }, - 'password:s' => { name => 'password' }, - 'timeout:s' => { name => 'timeout', default => '30' }, + 'username:s' => { name => 'username' }, + 'password:s' => { name => 'password' }, + 'timeout:s' => { name => 'timeout', default => '30' }, }); - + return $self; } diff --git a/apps/openvpn/omi/mode/serverusage.pm b/apps/openvpn/omi/mode/serverusage.pm index 134b2654e..a9e314be4 100644 --- a/apps/openvpn/omi/mode/serverusage.pm +++ b/apps/openvpn/omi/mode/serverusage.pm @@ -38,26 +38,26 @@ sub set_counters { key_values => [ { name => 'num_clients' } ], output_template => 'Current Clients: %s', perfdatas => [ - { label => 'num_clients', value => 'num_clients_absolute', template => '%s', min => 0 }, + { label => 'num_clients', template => '%s', min => 0 }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_in', per_second => 1 } ], + output_change_bytes => 2, output_template => 'Traffic In: %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', + { label => 'traffic_in', template => '%.2f', min => 0, unit => 'b/s' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_out', per_second => 1 } ], + output_change_bytes => 2, output_template => 'Traffic Out: %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', + { label => 'traffic_out', template => '%.2f', min => 0, unit => 'b/s' }, ], } @@ -69,11 +69,10 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); - + + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/apps/openweathermap/restapi/mode/cityweather.pm b/apps/openweathermap/restapi/mode/cityweather.pm index d4dbcf067..d83fdebb1 100644 --- a/apps/openweathermap/restapi/mode/cityweather.pm +++ b/apps/openweathermap/restapi/mode/cityweather.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'temperature' } ], output_template => 'Temperature: %d C', perfdatas => [ - { label => 'temperature', value => 'temperature_absolute', template => '%d', + { label => 'temperature', value => 'temperature', template => '%d', unit => 'C' } ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'humidity' } ], output_template => 'Humidity: %.2f%%', perfdatas => [ - { label => 'humidity', value => 'humidity_absolute', template => '%.1f', + { label => 'humidity', value => 'humidity', template => '%.1f', min => 0, max => 100, unit => '%' } ], } @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'clouds' } ], output_template => 'Clouds: %.2f%%', perfdatas => [ - { label => 'clouds', value => 'clouds_absolute', template => '%.1f', + { label => 'clouds', value => 'clouds', template => '%.1f', min => 0, max => 100, unit => '%' } ], } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'wind' } ], output_template => 'Wind: %.2f m/s', perfdatas => [ - { label => 'wind', value => 'wind_absolute', template => '%.1f', + { label => 'wind', value => 'wind', template => '%.1f', min => 0, unit => 'm/s' } ], } diff --git a/apps/pfsense/snmp/mode/packetstats.pm b/apps/pfsense/snmp/mode/packetstats.pm index 021be0117..8f3e932fc 100644 --- a/apps/pfsense/snmp/mode/packetstats.pm +++ b/apps/pfsense/snmp/mode/packetstats.pm @@ -35,62 +35,50 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'match', set => { - key_values => [ { name => 'pfCounterMatch', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pfCounterMatch', per_second => 1 } ], output_template => 'Packets Matched Filter Rule : %.2f/s', perfdatas => [ - { label => 'match', value => 'pfCounterMatch_per_second', template => '%.2f', unit => '/s', - min => 0 }, + { label => 'match', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'badoffset', set => { - key_values => [ { name => 'pfCounterBadOffset', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pfCounterBadOffset', per_second => 1 } ], output_template => 'Bad Offset Packets : %.2f/s', perfdatas => [ - { label => 'bad_offset', value => 'pfCounterBadOffset_per_second', template => '%.2f', unit => '/s', - min => 0 }, + { label => 'bad_offset', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'fragment', set => { - key_values => [ { name => 'pfCounterFragment', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pfCounterFragment', per_second => 1 } ], output_template => 'Fragmented Packets : %.2f/s', perfdatas => [ - { label => 'fragment', value => 'pfCounterFragment_per_second', template => '%.2f', unit => '/s', - min => 0 }, + { label => 'fragment', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'short', set => { - key_values => [ { name => 'pfCounterShort', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pfCounterShort', per_second => 1 } ], output_template => 'Short Packets : %.2f/s', perfdatas => [ - { label => 'short', value => 'pfCounterShort_per_second', template => '%.2f', unit => '/s', - min => 0 }, + { label => 'short', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'normalize', set => { - key_values => [ { name => 'pfCounterNormalize', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pfCounterNormalize', per_second => 1 } ], output_template => 'Normalized Packets : %.2f/s', perfdatas => [ - { label => 'normalize', value => 'pfCounterNormalize_per_second', template => '%.2f', unit => '/s', - min => 0 }, + { label => 'normalize', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'memdrop', set => { - key_values => [ { name => 'pfCounterMemDrop', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pfCounterMemDrop', per_second => 1 } ], output_template => 'Dropped Packets Due To Memory : %.2f/s', perfdatas => [ - { label => 'memdrop', value => 'pfCounterMemDrop_per_second', template => '%.2f', unit => '/s', - min => 0 }, + { label => 'memdrop', template => '%.2f', unit => '/s', min => 0 }, ], } }, @@ -101,11 +89,10 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); - + + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/apps/pfsense/snmp/mode/pfinterfaces.pm b/apps/pfsense/snmp/mode/pfinterfaces.pm index 477822e47..3f35fafea 100644 --- a/apps/pfsense/snmp/mode/pfinterfaces.pm +++ b/apps/pfsense/snmp/mode/pfinterfaces.pm @@ -35,42 +35,42 @@ sub set_counters { $self->{maps_counters}->{pfint} = [ { label => 'traffic-in-pass', set => { - key_values => [ { name => 'pfInterfacesIf4BytesInPass', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'pfInterfacesIf4BytesInPass', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic In Pass : %s %s/s', perfdatas => [ - { label => 'traffic_in_pass', value => 'pfInterfacesIf4BytesInPass_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_pass', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out-pass', set => { - key_values => [ { name => 'pfInterfacesIf4BytesOutPass', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'pfInterfacesIf4BytesOutPass', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic Out Pass : %s %s/s', perfdatas => [ - { label => 'traffic_out_pass', value => 'pfInterfacesIf4BytesOutPass_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_pass', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in-block', set => { - key_values => [ { name => 'pfInterfacesIf4BytesInBlock', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'pfInterfacesIf4BytesInBlock', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic In Block : %s %s/s', perfdatas => [ - { label => 'traffic_in_block', value => 'pfInterfacesIf4BytesInBlock_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_block', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out-block', set => { - key_values => [ { name => 'pfInterfacesIf4BytesOutBlock', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'pfInterfacesIf4BytesOutBlock', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic Out Block : %s %s/s', perfdatas => [ - { label => 'traffic_out_block', value => 'pfInterfacesIf4BytesOutBlock_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_block', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -87,12 +87,11 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); - + + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); + return $self; } @@ -126,7 +125,7 @@ sub manage_selection { $self->{pfint}->{$instance} = { display => $name }; } - + $options{snmp}->load(oids => [$mapping->{pfInterfacesIf4BytesInPass}->{oid}, $mapping->{pfInterfacesIf4BytesOutPass}->{oid}, $mapping->{pfInterfacesIf4BytesInBlock}->{oid}, $mapping->{pfInterfacesIf4BytesOutBlock}->{oid}, ], diff --git a/apps/php/apc/web/mode/filecache.pm b/apps/php/apc/web/mode/filecache.pm index 1f94c02d9..2752aa332 100644 --- a/apps/php/apc/web/mode/filecache.pm +++ b/apps/php/apc/web/mode/filecache.pm @@ -39,18 +39,18 @@ sub set_counters { key_values => [ { name => 'rr' } ], output_template => 'Request Rate (global): %.2f', perfdatas => [ - { value => 'rr_absolute', label => 'request_rate',template => '%.2f', + { label => 'request_rate', template => '%.2f', unit => 'r/s', min => 0 }, ], } }, { label => 'request-rate-now', set => { key_values => [ { name => 'hits', diff => 1 }, { name => 'misses', diff => 1 } ], - closure_custom_calc => $self->can('custom_rr_calc'), per_second => 1, + closure_custom_calc => $self->can('custom_rr_calc'), output_template => 'Request Rate : %.2f', output_error_template => 'Request Rate : %s', output_use => 'rr_now', threshold_use => 'rr_now', perfdatas => [ - { value => 'rr_now', label => 'request_rate_now', template => '%.2f', + { label => 'request_rate_now', value => 'rr_now', template => '%.2f', unit => 'r/s', min => 0 }, ], } @@ -59,18 +59,18 @@ sub set_counters { key_values => [ { name => 'hr' } ], output_template => 'Hit Rate (global): %.2f', perfdatas => [ - { value => 'hr_absolute', label => 'hit_rate',template => '%.2f', + { label => 'hit_rate',template => '%.2f', unit => 'r/s', min => 0 }, ], } }, { label => 'hit-rate-now', set => { key_values => [ { name => 'hits', diff => 1 } ], - closure_custom_calc => $self->can('custom_hr_calc'), per_second => 1, + closure_custom_calc => $self->can('custom_hr_calc'), output_template => 'Hit Rate : %.2f', output_error_template => 'Hit Rate : %s', output_use => 'hr_now', threshold_use => 'hr_now', perfdatas => [ - { value => 'hr_now', label => 'hit_rate_now', template => '%.2f', + { label => 'hit_rate_now', value => 'hr_now', template => '%.2f', unit => 'r/s', min => 0 }, ], } @@ -79,18 +79,18 @@ sub set_counters { key_values => [ { name => 'mr' } ], output_template => 'Miss Rate (global): %.2f', perfdatas => [ - { value => 'mr_absolute', label => 'miss_rate',template => '%.2f', + { label => 'miss_rate',template => '%.2f', unit => 'r/s', min => 0 }, ], } }, { label => 'miss-rate-now', set => { key_values => [ { name => 'misses', diff => 1 } ], - closure_custom_calc => $self->can('custom_mr_calc'), per_second => 1, + closure_custom_calc => $self->can('custom_mr_calc'), output_template => 'Miss Rate : %.2f', output_error_template => 'Miss Rate : %s', output_use => 'mr_now', threshold_use => 'mr_now', perfdatas => [ - { value => 'mr_now', label => 'miss_rate_now', template => '%.2f', + { label => 'miss_rate_now', value => 'mr_now', template => '%.2f', unit => 'r/s', min => 0 }, ], } @@ -101,7 +101,7 @@ sub set_counters { output_template => 'Hit Ratio (global) : %.2f %%', output_error_template => 'Hit Ratio (global): %s', output_use => 'hit_ratio', threshold_use => 'hit_ratio', perfdatas => [ - { value => 'hit_ratio', label => 'hit_ratio', template => '%.2f', + { label => 'hit_ratio', value => 'hit_ratio', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -112,7 +112,7 @@ sub set_counters { output_template => 'Hit Ratio : %.2f %%', output_error_template => 'Hit Ratio : %s', output_use => 'hit_ratio_now', threshold_use => 'hit_ratio_now', perfdatas => [ - { value => 'hit_ratio_now', label => 'hit_ratio_now', template => '%.2f', + { label => 'hit_ratio_now', value => 'hit_ratio_now', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/apps/php/apc/web/mode/memory.pm b/apps/php/apc/web/mode/memory.pm index 97e607035..b49baf8ea 100644 --- a/apps/php/apc/web/mode/memory.pm +++ b/apps/php/apc/web/mode/memory.pm @@ -50,9 +50,9 @@ sub set_counters { { label => 'fragmentation', set => { key_values => [ { name => 'fragmentation' } ], output_template => 'Memory Fragmentation: %.2f %%', output_error_template => 'Memory Fragmentation: %s', - output_use => 'fragmentation_absolute', threshold_use => 'fragmentation_absolute', + output_use => 'fragmentation', threshold_use => 'fragmentation', perfdatas => [ - { value => 'fragmentation_absolute', label => 'fragmentation', template => '%.2f', + { value => 'fragmentation', label => 'fragmentation', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/apps/php/fpm/web/mode/usage.pm b/apps/php/fpm/web/mode/usage.pm index 155c772c8..1d46d823b 100644 --- a/apps/php/fpm/web/mode/usage.pm +++ b/apps/php/fpm/web/mode/usage.pm @@ -40,7 +40,7 @@ sub set_counters { closure_custom_calc => $self->can('custom_active_calc'), closure_custom_output => $self->can('custom_active_output'), threshold_use => 'active_prct', - closure_custom_perfdata => => $self->can('custom_active_perfdata'), + closure_custom_perfdata => => $self->can('custom_active_perfdata') } }, { label => 'idle-processes', set => { @@ -48,29 +48,27 @@ sub set_counters { closure_custom_calc => $self->can('custom_idle_calc'), closure_custom_output => $self->can('custom_idle_output'), threshold_use => 'idle_prct', - closure_custom_perfdata => => $self->can('custom_idle_perfdata'), + closure_custom_perfdata => => $self->can('custom_idle_perfdata') } }, { label => 'listen-queue', set => { key_values => [ { name => 'listen_queue' }, { name => 'max_listen_queue' } ], output_template => 'Listen queue : %s', - output_use => 'listen_queue_absolute', threshold_use => 'listen_queue_absolute', + output_use => 'listen_queue', threshold_use => 'listen_queue', perfdatas => [ - { label => 'listen_queue', template => '%s', value => 'listen_queue_absolute', - min => 0, max => 'max_listen_queue_absolute' }, - ], + { label => 'listen_queue', template => '%s', + min => 0, max => 'max_listen_queue' } + ] } }, { label => 'requests', set => { - key_values => [ { name => 'request', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'request', per_second => 1 } ], output_template => 'Requests : %.2f/s', perfdatas => [ - { label => 'requests', template => '%.2f', value => 'request_per_second', - unit => '/s', min => 0 }, - ], + { label => 'requests', template => '%.2f', unit => '/s', min => 0 } + ] } - }, + } ]; } @@ -140,19 +138,19 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, - "port:s" => { name => 'port', }, - "proto:s" => { name => 'proto' }, - "urlpath:s" => { name => 'url_path', default => "/fpm-status" }, - "credentials" => { name => 'credentials' }, - "basic" => { name => 'basic' }, - "username:s" => { name => 'username' }, - "password:s" => { name => 'password' }, - "timeout:s" => { name => 'timeout', default => 5 }, + 'hostname:s' => { name => 'hostname' }, + 'port:s' => { name => 'port', }, + 'proto:s' => { name => 'proto' }, + 'urlpath:s' => { name => 'url_path', default => "/fpm-status" }, + 'credentials' => { name => 'credentials' }, + 'basic' => { name => 'basic' }, + 'username:s' => { name => 'username' }, + 'password:s' => { name => 'password' }, + 'timeout:s' => { name => 'timeout', default => 5 }, }); - + $self->{http} = centreon::plugins::http->new(%options); - + return $self; } diff --git a/apps/pineapp/securemail/snmp/mode/system.pm b/apps/pineapp/securemail/snmp/mode/system.pm index 6ca1e2b11..f06331f1d 100644 --- a/apps/pineapp/securemail/snmp/mode/system.pm +++ b/apps/pineapp/securemail/snmp/mode/system.pm @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'cpuload' . $_ . 'minavg' } ], output_template => '%s (' . $_ . 'm)', perfdatas => [ - { value => 'cpuload' . $_ . 'minavg_absolute', template => '%s', min => 0 }, + { value => 'cpuload' . $_ . 'minavg', template => '%s', min => 0 }, ], } }; @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'mailsysteminboundqueue' } ], output_template => 'messages inbound queue: %s', perfdatas => [ - { value => 'mailsysteminboundqueue_absolute', template => '%s', min => 0 }, + { value => 'mailsysteminboundqueue', template => '%s', min => 0 }, ], } }, @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'mailsystemoutboundqueue' } ], output_template => 'messages outbound queue: %s', perfdatas => [ - { value => 'mailsystemoutboundqueue_absolute', template => '%s', min => 0 }, + { value => 'mailsystemoutboundqueue', template => '%s', min => 0 }, ], } }, @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => 'mailQueueHigh' } ], output_template => 'messages high priority: %s', perfdatas => [ - { value => 'mailQueueHigh_absolute', template => '%s', min => 0 }, + { value => 'mailQueueHigh', template => '%s', min => 0 }, ], } }, @@ -100,7 +100,7 @@ sub set_counters { key_values => [ { name => 'mailQueueNormal' } ], output_template => 'messages normal priority: %s', perfdatas => [ - { value => 'mailQueueNormal_absolute', template => '%s', min => 0 }, + { value => 'mailQueueNormal', template => '%s', min => 0 }, ], } }, @@ -108,7 +108,7 @@ sub set_counters { key_values => [ { name => 'mailQueueLow' } ], output_template => 'messages low priority: %s', perfdatas => [ - { value => 'mailQueueLow_absolute', template => '%s', min => 0 }, + { value => 'mailQueueLow', template => '%s', min => 0 }, ], } }, @@ -116,7 +116,7 @@ sub set_counters { key_values => [ { name => 'mailQueueTotal' } ], output_template => 'messages queue total: %s', perfdatas => [ - { value => 'mailQueueTotal_absolute', template => '%s', min => 0 }, + { value => 'mailQueueTotal', template => '%s', min => 0 }, ], } }, diff --git a/apps/protocols/bgp/4/mode/bgppeerstate.pm b/apps/protocols/bgp/4/mode/bgppeerstate.pm index c520bff21..41553d643 100644 --- a/apps/protocols/bgp/4/mode/bgppeerstate.pm +++ b/apps/protocols/bgp/4/mode/bgppeerstate.pm @@ -71,8 +71,8 @@ sub set_counters { key_values => [ { name => 'seconds' }, { name => 'display' } ], output_template => 'Last update : %ss', perfdatas => [ - { label => 'seconds', value => 'seconds_absolute', template => '%s', - unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'seconds', value => 'seconds', template => '%s', + unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/protocols/http/mode/expectedcontent.pm b/apps/protocols/http/mode/expectedcontent.pm index 3a11046c4..d0c4f09ae 100644 --- a/apps/protocols/http/mode/expectedcontent.pm +++ b/apps/protocols/http/mode/expectedcontent.pm @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'size' } ], output_template => 'Content size : %s', perfdatas => [ - { label => 'size', value => 'size_absolute', template => '%s', min => 0, unit => 'B' }, + { label => 'size', value => 'size', template => '%s', min => 0, unit => 'B' }, ], } }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'time' } ], output_template => 'Response time : %.3fs', perfdatas => [ - { label => 'time', value => 'time_absolute', template => '%.3f', min => 0, unit => 's' }, + { label => 'time', value => 'time', template => '%.3f', min => 0, unit => 's' }, ], } }, @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'extracted' } ], output_template => 'Extracted value : %s', perfdatas => [ - { label => 'value', value => 'extracted_absolute', template => '%s' }, + { label => 'value', value => 'extracted', template => '%s' }, ], } }, diff --git a/apps/protocols/http/mode/response.pm b/apps/protocols/http/mode/response.pm index 34505851c..99a291f83 100644 --- a/apps/protocols/http/mode/response.pm +++ b/apps/protocols/http/mode/response.pm @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'time' } ], output_template => 'Response time %.3fs', perfdatas => [ - { label => 'time', value => 'time_absolute', template => '%.3f', min => 0, unit => 's' } + { label => 'time', value => 'time', template => '%.3f', min => 0, unit => 's' } ] } }, @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'size' } ], output_template => 'Content size : %s', perfdatas => [ - { label => 'size', value => 'size_absolute', template => '%s', min => 0, unit => 'B' } + { label => 'size', value => 'size', template => '%s', min => 0, unit => 'B' } ] } } diff --git a/apps/protocols/ldap/mode/search.pm b/apps/protocols/ldap/mode/search.pm index a46d42d70..15cc31869 100644 --- a/apps/protocols/ldap/mode/search.pm +++ b/apps/protocols/ldap/mode/search.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'entries' } ], output_template => 'Number of results returned: %s', perfdatas => [ - { value => 'entries_absolute', template => '%s', min => 0 }, + { value => 'entries', template => '%s', min => 0 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'time' } ], output_template => 'Response time : %.3fs', perfdatas => [ - { label => 'time', value => 'time_absolute', template => '%.3f', min => 0, unit => 's' }, + { label => 'time', value => 'time', template => '%.3f', min => 0, unit => 's' }, ], } }, diff --git a/apps/protocols/ospf/snmp/mode/neighbor.pm b/apps/protocols/ospf/snmp/mode/neighbor.pm index 28f5f626b..b93d12ced 100644 --- a/apps/protocols/ospf/snmp/mode/neighbor.pm +++ b/apps/protocols/ospf/snmp/mode/neighbor.pm @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total neighbors : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } diff --git a/apps/protocols/radius/mode/login.pm b/apps/protocols/radius/mode/login.pm index 7b5cc3134..6fdd95c8d 100644 --- a/apps/protocols/radius/mode/login.pm +++ b/apps/protocols/radius/mode/login.pm @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'elapsed' } ], output_template => 'Response time : %.3f second(s)', perfdatas => [ - { label => 'time', value => 'elapsed_absolute', template => '%.3f', + { label => 'time', value => 'elapsed', template => '%.3f', min => 0, unit => 's' }, ], } diff --git a/apps/protocols/snmp/mode/responsetime.pm b/apps/protocols/snmp/mode/responsetime.pm index 851394377..8b5f81e67 100644 --- a/apps/protocols/snmp/mode/responsetime.pm +++ b/apps/protocols/snmp/mode/responsetime.pm @@ -38,21 +38,21 @@ sub set_counters { key_values => [ { name => 'rta' } ], output_template => 'rta %.3fms', perfdatas => [ - { label => 'rta', value => 'rta_absolute', template => '%.3f', min => 0, unit => 'ms' }, + { label => 'rta', value => 'rta', template => '%.3f', min => 0, unit => 'ms' }, ], } }, { label => 'rtmax', display_ok => 0, set => { key_values => [ { name => 'rtmax' } ], perfdatas => [ - { label => 'rtmax', value => 'rtmax_absolute', template => '%.3f', min => 0, unit => 'ms' }, + { label => 'rtmax', value => 'rtmax', template => '%.3f', min => 0, unit => 'ms' }, ], } }, { label => 'rtmin', display_ok => 0, set => { key_values => [ { name => 'rtmin' } ], perfdatas => [ - { label => 'rtmin', value => 'rtmin_absolute', template => '%.3f', min => 0, unit => 'ms' }, + { label => 'rtmin', value => 'rtmin', template => '%.3f', min => 0, unit => 'ms' }, ], } }, @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'pl' } ], output_template => 'lost %s%%', perfdatas => [ - { label => 'pl', value => 'pl_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { label => 'pl', value => 'pl', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/apps/protocols/ssh/mode/login.pm b/apps/protocols/ssh/mode/login.pm index 8a8170f11..44694e161 100644 --- a/apps/protocols/ssh/mode/login.pm +++ b/apps/protocols/ssh/mode/login.pm @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'time_elapsed' } ], output_template => 'Response time %.3fs', perfdatas => [ - { label => 'time', value => 'time_elapsed_absolute', template => '%.3f', unit => 's', min => 0 }, + { label => 'time', value => 'time_elapsed', template => '%.3f', unit => 's', min => 0 }, ], } }, diff --git a/apps/protocols/tftp/mode/commands.pm b/apps/protocols/tftp/mode/commands.pm index 015c0df81..18dee0d58 100644 --- a/apps/protocols/tftp/mode/commands.pm +++ b/apps/protocols/tftp/mode/commands.pm @@ -63,8 +63,8 @@ sub set_counters { key_values => [ { name => 'timeelapsed' }, { name => 'display' } ], output_template => 'response time %.3fs', perfdatas => [ - { label => 'time', value => 'timeelapsed_absolute', template => '%.3f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'time', value => 'timeelapsed', template => '%.3f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/proxmox/ve/restapi/mode/vmusage.pm b/apps/proxmox/ve/restapi/mode/vmusage.pm index 763ca117c..7d7577a15 100644 --- a/apps/proxmox/ve/restapi/mode/vmusage.pm +++ b/apps/proxmox/ve/restapi/mode/vmusage.pm @@ -185,22 +185,20 @@ sub set_counters { } }, { label => 'read-iops', set => { - key_values => [ { name => 'read_io', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'read_io', per_second => 1 }, { name => 'display' } ], output_template => 'Read IOPs : %.2f', output_error_template => "Read IOPs : %s", perfdatas => [ - { label => 'read_iops', value => 'read_io_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'read_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'write-iops', set => { - key_values => [ { name => 'write_io', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'write_io', per_second => 1 }, { name => 'display' } ], output_template => 'Write IOPs : %.2f', output_error_template => "Write IOPs : %s", perfdatas => [ - { label => 'write_iops', value => 'write_io_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'write_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -216,22 +214,22 @@ sub set_counters { $self->{maps_counters}->{vms_traffic} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic In : %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic Out : %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } @@ -251,6 +249,7 @@ sub new { 'warning-vm-status:s' => { name => 'warning_vm_status', default => '' }, 'critical-vm-status:s' => { name => 'critical_vm_status', default => '' } }); + $self->{statefile_cache_vms} = centreon::plugins::statefile->new(%options); return $self; } diff --git a/apps/pvx/restapi/mode/httphits.pm b/apps/pvx/restapi/mode/httphits.pm index 0b3b1807c..8b62c0c6c 100644 --- a/apps/pvx/restapi/mode/httphits.pm +++ b/apps/pvx/restapi/mode/httphits.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'ratio' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'Ratio: %.2f', perfdatas => [ - { label => 'ratio', value => 'ratio_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'ratio', value => 'ratio', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'key' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'error_hits' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'Hits Error: %.3f hits/s', perfdatas => [ - { label => 'hits_error', value => 'error_hits_absolute', template => '%.3f', - min => 0, unit => 'hits/s', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'hits_error', value => 'error_hits', template => '%.3f', + min => 0, unit => 'hits/s', label_extra_instance => 1, instance_use => 'key' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'hits' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'Hits: %.3f hits/s', perfdatas => [ - { label => 'hits', value => 'hits_absolute', template => '%.3f', - min => 0, unit => 'hits/s', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'hits', value => 'hits', template => '%.3f', + min => 0, unit => 'hits/s', label_extra_instance => 1, instance_use => 'key' }, ], } }, diff --git a/apps/pvx/restapi/mode/networkconnection.pm b/apps/pvx/restapi/mode/networkconnection.pm index 347284370..4c8da8f69 100644 --- a/apps/pvx/restapi/mode/networkconnection.pm +++ b/apps/pvx/restapi/mode/networkconnection.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'syns_ratio' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'Ratio: %.2f', perfdatas => [ - { label => 'ratio', value => 'syns_ratio_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'ratio', value => 'syns_ratio', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'key' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'syns' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'Connections Attempts: %.2f conn/s', perfdatas => [ - { label => 'attempt', value => 'syns_absolute', template => '%.2f', - min => 0, unit => 'connections/s', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'attempt', value => 'syns', template => '%.2f', + min => 0, unit => 'connections/s', label_extra_instance => 1, instance_use => 'key' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'ct_count' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'Successful Connections: %.2f conn/s', perfdatas => [ - { label => 'successful', value => 'ct_count_absolute', template => '%.2f', - min => 0, unit => 'connections/s', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'successful', value => 'ct_count', template => '%.2f', + min => 0, unit => 'connections/s', label_extra_instance => 1, instance_use => 'key' }, ], } }, @@ -64,8 +64,8 @@ sub set_counters { key_values => [ { name => 'ct' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'Average Connection Time: %.3f ms', perfdatas => [ - { label => 'connection_time', value => 'ct_absolute', template => '%.3f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'connection_time', value => 'ct', template => '%.3f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'key' }, ], } }, diff --git a/apps/pvx/restapi/mode/networktraffic.pm b/apps/pvx/restapi/mode/networktraffic.pm index 9802f8dea..26b045e12 100644 --- a/apps/pvx/restapi/mode/networktraffic.pm +++ b/apps/pvx/restapi/mode/networktraffic.pm @@ -39,7 +39,7 @@ sub set_counters { output_template => 'Total Traffic: %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'total_traffic', value => 'total_traffic_absolute', template => '%d', + { label => 'total_traffic', value => 'total_traffic', template => '%d', min => 0, unit => 'b/s' }, ], } @@ -49,7 +49,7 @@ sub set_counters { output_template => 'Total Server Traffic: %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'total_server_traffic', value => 'total_server_traffic_absolute', template => '%d', + { label => 'total_server_traffic', value => 'total_server_traffic', template => '%d', min => 0, unit => 'b/s' }, ], } @@ -59,7 +59,7 @@ sub set_counters { output_template => 'Total Client Traffic: %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'total_client_traffic', value => 'total_client_traffic_absolute', template => '%d', + { label => 'total_client_traffic', value => 'total_client_traffic', template => '%d', min => 0, unit => 'b/s' }, ], } @@ -72,8 +72,8 @@ sub set_counters { output_template => 'Traffic: %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic', value => 'traffic_absolute', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'traffic', value => 'traffic', template => '%d', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'key' }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { output_template => 'Server Traffic: %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'server_traffic', value => 'server_traffic_absolute', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'server_traffic', value => 'server_traffic', template => '%d', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'key' }, ], } }, @@ -92,8 +92,8 @@ sub set_counters { output_template => 'Client Traffic: %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'client_traffic', value => 'client_traffic_absolute', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'client_traffic', value => 'client_traffic', template => '%d', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'key' }, ], } }, diff --git a/apps/pvx/restapi/mode/networkuserexperience.pm b/apps/pvx/restapi/mode/networkuserexperience.pm index 37ea9586d..6bad42c0b 100644 --- a/apps/pvx/restapi/mode/networkuserexperience.pm +++ b/apps/pvx/restapi/mode/networkuserexperience.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'user_experience' }, { name => 'key' }, { name => 'instance_label' } ], output_template => 'End-User Experience: %.3f s', perfdatas => [ - { label => 'time', value => 'user_experience_absolute', template => '%.3f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'key_absolute' }, + { label => 'time', value => 'user_experience', template => '%.3f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'key' }, ], } }, diff --git a/apps/redis/cli/mode/clients.pm b/apps/redis/cli/mode/clients.pm index 22209c26d..43241d0e5 100644 --- a/apps/redis/cli/mode/clients.pm +++ b/apps/redis/cli/mode/clients.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'connected_clients' } ], output_template => 'Connected clients: %s', perfdatas => [ - { label => 'connected_clients', value => 'connected_clients_absolute', template => '%s', min => 0 }, + { label => 'connected_clients', value => 'connected_clients', template => '%s', min => 0 }, ], }, }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'blocked_clients' } ], output_template => 'Blocked clients: %s', perfdatas => [ - { label => 'blocked_clients', value => 'blocked_clients_absolute', template => '%s', min => 0 }, + { label => 'blocked_clients', value => 'blocked_clients', template => '%s', min => 0 }, ], }, }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'client_longest_output_list' } ], output_template => 'Client longest output list: %s', perfdatas => [ - { label => 'client_longest_output_list', value => 'client_longest_output_list_absolute', template => '%s', min => 0 }, + { label => 'client_longest_output_list', value => 'client_longest_output_list', template => '%s', min => 0 }, ], }, }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'client_biggest_input_buf' } ], output_template => 'Client biggest input buffer: %s', perfdatas => [ - { label => 'client_biggest_input_buf', value => 'client_biggest_input_buf_absolute', template => '%s', min => 0 }, + { label => 'client_biggest_input_buf', value => 'client_biggest_input_buf', template => '%s', min => 0 }, ], }, } diff --git a/apps/redis/cli/mode/commands.pm b/apps/redis/cli/mode/commands.pm index 1d39b7b9d..3c1fbf497 100644 --- a/apps/redis/cli/mode/commands.pm +++ b/apps/redis/cli/mode/commands.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'total_commands_processed', diff => 1 } ], output_template => 'Processed: %s', perfdatas => [ - { label => 'processed_commands', value => 'total_commands_processed_absolute', template => '%s', min => 0 }, + { label => 'processed_commands', value => 'total_commands_processed', template => '%s', min => 0 }, ], }, }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'instantaneous_ops_per_sec' } ], output_template => 'Processed per sec: %s', perfdatas => [ - { label => 'ops_per_sec', value => 'instantaneous_ops_per_sec_absolute', template => '%s', min => 0, unit => 'ops/s' }, + { label => 'ops_per_sec', value => 'instantaneous_ops_per_sec', template => '%s', min => 0, unit => 'ops/s' }, ], }, }, diff --git a/apps/redis/cli/mode/connections.pm b/apps/redis/cli/mode/connections.pm index ef475b688..fa986fb4d 100644 --- a/apps/redis/cli/mode/connections.pm +++ b/apps/redis/cli/mode/connections.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'total_connections_received', diff => 1 } ], output_template => 'Received: %s', perfdatas => [ - { label => 'received_connections', value => 'total_connections_received_absolute', template => '%s', min => 0 }, + { label => 'received_connections', template => '%s', min => 0 }, ], }, }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'rejected_connections', diff => 1 } ], output_template => 'Rejected: %s', perfdatas => [ - { label => 'rejected_connections', value => 'rejected_connections_absolute', template => '%s', min => 0 }, + { label => 'rejected_connections', template => '%s', min => 0 }, ], }, }, @@ -55,20 +55,20 @@ sub set_counters { $self->{maps_counters}->{traffic} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'total_net_input_bytes', diff => 1 } ], + key_values => [ { name => 'total_net_input_bytes', per_second => 1 } ], output_template => 'Traffic In: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'total_net_input_bytes_per_second', template => '%d', min => 0, unit => 'b/s' }, + { label => 'traffic_in', template => '%d', min => 0, unit => 'b/s' }, ], }, }, { label => 'traffic-out', set => { - key_values => [ { name => 'total_net_output_bytes', diff => 1 } ], + key_values => [ { name => 'total_net_output_bytes', per_second => 1 } ], output_template => 'Traffic Out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'total_net_output_bytes_per_second', template => '%d', min => 0, unit => 'b/s' }, + { label => 'traffic_out', template => '%d', min => 0, unit => 'b/s' }, ], }, }, @@ -92,10 +92,8 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); + $options{options}->add_options(arguments => { + }); return $self; } diff --git a/apps/redis/cli/mode/cpu.pm b/apps/redis/cli/mode/cpu.pm index 74d1719b7..6191590bf 100644 --- a/apps/redis/cli/mode/cpu.pm +++ b/apps/redis/cli/mode/cpu.pm @@ -38,7 +38,6 @@ sub set_counters { key_values => [ { name => 'used_cpu_sys', diff => 1 } ], closure_custom_calc => $self->can('custom_usage_calc'), closure_custom_calc_extra_options => { label_ref => 'used_cpu_sys' }, output_template => 'System: %.2f %%', output_use => 'used_delta', threshold_use => 'used_delta', - per_second => 1, perfdatas => [ { label => 'sys', value => 'used_delta', template => '%.2f', min => 0, max => 100, unit => '%' }, ], @@ -48,7 +47,6 @@ sub set_counters { key_values => [ { name => 'used_cpu_user', diff => 1 } ], closure_custom_calc => $self->can('custom_usage_calc'), closure_custom_calc_extra_options => { label_ref => 'used_cpu_user' }, output_template => 'User: %.2f %%', output_use => 'used_delta', threshold_use => 'used_delta', - per_second => 1, perfdatas => [ { label => 'user', value => 'used_delta', template => '%.2f', min => 0, max => 100, unit => '%' }, ], @@ -58,7 +56,6 @@ sub set_counters { key_values => [ { name => 'used_cpu_sys_children', diff => 1 } ], closure_custom_calc => $self->can('custom_usage_calc'), closure_custom_calc_extra_options => { label_ref => 'used_cpu_sys_children' }, output_template => 'System children: %.2f %%', output_use => 'used_delta', threshold_use => 'used_delta', - per_second => 1, perfdatas => [ { label => 'sys_children', value => 'used_delta', template => '%.2f', min => 0, max => 100, unit => '%' }, ], @@ -68,12 +65,11 @@ sub set_counters { key_values => [ { name => 'used_cpu_user_children', diff => 1 } ], closure_custom_calc => $self->can('custom_usage_calc'), closure_custom_calc_extra_options => { label_ref => 'used_cpu_user_children' }, output_template => 'User children: %.2f %%', output_use => 'used_delta', threshold_use => 'used_delta', - per_second => 1, perfdatas => [ { label => 'user_children', value => 'used_delta', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } - }, + } ]; } @@ -97,10 +93,8 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); + $options{options}->add_options(arguments => { + }); return $self; } diff --git a/apps/redis/cli/mode/memory.pm b/apps/redis/cli/mode/memory.pm index 484c3665c..e92c96aa6 100644 --- a/apps/redis/cli/mode/memory.pm +++ b/apps/redis/cli/mode/memory.pm @@ -169,7 +169,7 @@ sub set_counters { key_values => [ { name => 'mem_fragmentation_ratio' } ], output_template => 'Fragmentation ratio: %s', perfdatas => [ - { label => 'fragmentation_ratio', value => 'mem_fragmentation_ratio_absolute', template => '%s', min => 0 }, + { label => 'fragmentation_ratio', value => 'mem_fragmentation_ratio', template => '%s', min => 0 }, ], }, }, @@ -177,7 +177,7 @@ sub set_counters { key_values => [ { name => 'active_defrag_running' } ], output_template => 'Defragmentation running: %s', perfdatas => [ - { label => 'defrag_running', value => 'active_defrag_running_absolute', template => '%s', min => 0 }, + { label => 'defrag_running', value => 'active_defrag_running', template => '%s', min => 0 }, ], }, }, @@ -185,7 +185,7 @@ sub set_counters { key_values => [ { name => 'lazyfree_pending_objects' } ], output_template => 'Lazyfree pending objects: %s', perfdatas => [ - { label => 'lazyfree_pending_objects', value => 'lazyfree_pending_objects_absolute', template => '%s', min => 0 }, + { label => 'lazyfree_pending_objects', value => 'lazyfree_pending_objects', template => '%s', min => 0 }, ], }, }, diff --git a/apps/redis/cli/mode/persistence.pm b/apps/redis/cli/mode/persistence.pm index b5d8b4dd9..e8f247f86 100644 --- a/apps/redis/cli/mode/persistence.pm +++ b/apps/redis/cli/mode/persistence.pm @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'rdb_changes_since_last_save' } ], output_template => 'Number of changes since the last dump: %s', perfdatas => [ - { label => 'changes', value => 'rdb_changes_since_last_save_absolute', template => '%s', min => 0 }, + { label => 'changes', value => 'rdb_changes_since_last_save', template => '%s', min => 0 }, ], }, }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'rdb_last_save_time' }, { name => 'rdb_last_save_time_sec' } ], output_template => 'Time since last successful save: %s', perfdatas => [ - { label => 'last_save', value => 'rdb_last_save_time_sec_absolute', template => '%s', min => 0, unit => 's' }, + { label => 'last_save', value => 'rdb_last_save_time_sec', template => '%s', min => 0, unit => 's' }, ], }, }, @@ -63,7 +63,7 @@ sub set_counters { output_template => 'Size of last save: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'save_size', value => 'rdb_last_cow_size_absolute', template => '%s', min => 0, unit => 'B' }, + { label => 'save_size', value => 'rdb_last_cow_size', template => '%s', min => 0, unit => 'B' }, ], }, }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'rdb_last_bgsave_time' } ], output_template => 'Duration of last save: %s s', perfdatas => [ - { label => 'last_save_duration', value => 'rdb_last_bgsave_time_absolute', template => '%s', min => 0, unit => 's' }, + { label => 'last_save_duration', value => 'rdb_last_bgsave_time', template => '%s', min => 0, unit => 's' }, ], }, }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'rdb_current_bgsave_time' } ], output_template => 'Duration of current save: %s s', perfdatas => [ - { label => 'current_save_duration', value => 'rdb_current_bgsave_time_absolute', template => '%s', min => 0, unit => 's' }, + { label => 'current_save_duration', value => 'rdb_current_bgsave_time', template => '%s', min => 0, unit => 's' }, ], }, }, diff --git a/apps/redis/cli/mode/replication.pm b/apps/redis/cli/mode/replication.pm index 2329efb61..5de24964c 100644 --- a/apps/redis/cli/mode/replication.pm +++ b/apps/redis/cli/mode/replication.pm @@ -48,7 +48,7 @@ sub set_counters { key_values => [ { name => 'connected_slaves' } ], output_template => 'Number of connected slaves: %s', perfdatas => [ - { label => 'connected_slaves', value => 'connected_slaves_absolute', template => '%s', min => 0 }, + { label => 'connected_slaves', value => 'connected_slaves', template => '%s', min => 0 }, ], }, }, @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'master_repl_offset' } ], output_template => 'Master replication offset: %s s', perfdatas => [ - { label => 'master_repl_offset', value => 'master_repl_offset_absolute', template => '%s', min => 0, unit => 's' }, + { label => 'master_repl_offset', value => 'master_repl_offset', template => '%s', min => 0, unit => 's' }, ], }, }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'master_last_io_seconds_ago' } ], output_template => 'Last interaction with master: %s s', perfdatas => [ - { label => 'master_last_io', value => 'master_last_io_seconds_ago_absolute', template => '%s', min => 0, unit => 's' }, + { label => 'master_last_io', value => 'master_last_io_seconds_ago', template => '%s', min => 0, unit => 's' }, ], }, }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'slave_repl_offset' } ], output_template => 'Slave replication offset: %s s', perfdatas => [ - { label => 'slave_repl_offset', value => 'slave_repl_offset_absolute', template => '%s', min => 0, unit => 's' }, + { label => 'slave_repl_offset', value => 'slave_repl_offset', template => '%s', min => 0, unit => 's' }, ], }, }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'slave_priority' } ], output_template => 'Slave replication offset: %s s', perfdatas => [ - { label => 'slave_priority', value => 'slave_priority_absolute', template => '%s' }, + { label => 'slave_priority', value => 'slave_priority', template => '%s' }, ], }, }, @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'slave_read_only' } ], output_template => 'Slave replication offset: %s s', perfdatas => [ - { label => 'slave_read_only', value => 'slave_read_only_absolute', template => '%s' }, + { label => 'slave_read_only', value => 'slave_read_only', template => '%s' }, ], }, }, diff --git a/apps/redis/restapi/mode/clusterstats.pm b/apps/redis/restapi/mode/clusterstats.pm index eece4047e..a759a2725 100644 --- a/apps/redis/restapi/mode/clusterstats.pm +++ b/apps/redis/restapi/mode/clusterstats.pm @@ -104,7 +104,7 @@ sub set_counters { key_values => [ { name => 'cpu_system' } ], output_template => 'Cpu system: %.2f %%', perfdatas => [ - { label => 'cpu_system', value => 'cpu_system_absolute', template => '%.2f', + { label => 'cpu_system', value => 'cpu_system', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -113,7 +113,7 @@ sub set_counters { key_values => [ { name => 'cpu_user' } ], output_template => 'Cpu user: %.2f %%', perfdatas => [ - { label => 'cpu_user', value => 'cpu_user_absolute', template => '%.2f', + { label => 'cpu_user', value => 'cpu_user', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -162,7 +162,7 @@ sub set_counters { key_values => [ { name => 'bigstore_iops' } ], output_template => 'Flash IOPS: %s ops/s', perfdatas => [ - { label => 'flash_iops', value => 'bigstore_iops_absolute', template => '%s', + { label => 'flash_iops', value => 'bigstore_iops', template => '%s', min => 0, unit => 'ops/s' }, ], } @@ -172,7 +172,7 @@ sub set_counters { output_template => 'Flash throughput: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'flash_throughput', value => 'bigstore_throughput_absolute', template => '%s', + { label => 'flash_throughput', value => 'bigstore_throughput', template => '%s', min => 0, unit => 'B/s' }, ], } @@ -181,7 +181,7 @@ sub set_counters { key_values => [ { name => 'conns' } ], output_template => 'Connections: %s', perfdatas => [ - { label => 'connections', value => 'conns_absolute', template => '%s', + { label => 'connections', value => 'conns', template => '%s', min => 0 }, ], } @@ -190,7 +190,7 @@ sub set_counters { key_values => [ { name => 'total_req' } ], output_template => 'Requests rate: %s ops/s', perfdatas => [ - { label => 'requests', value => 'total_req_absolute', template => '%s', + { label => 'requests', value => 'total_req', template => '%s', min => 0, unit => 'ops/s' }, ], } @@ -200,7 +200,7 @@ sub set_counters { output_template => 'Traffic In: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'ingress_absolute', template => '%d', min => 0, unit => 'b/s' }, + { label => 'traffic_in', value => 'ingress', template => '%d', min => 0, unit => 'b/s' }, ], }, }, @@ -209,7 +209,7 @@ sub set_counters { output_template => 'Traffic Out: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'egress_absolute', template => '%d', min => 0, unit => 'b/s' }, + { label => 'traffic_out', value => 'egress', template => '%d', min => 0, unit => 'b/s' }, ], }, }, diff --git a/apps/redis/restapi/mode/databasesstats.pm b/apps/redis/restapi/mode/databasesstats.pm index c98a3306c..997783930 100644 --- a/apps/redis/restapi/mode/databasesstats.pm +++ b/apps/redis/restapi/mode/databasesstats.pm @@ -236,8 +236,8 @@ sub set_counters { key_values => [ { name => 'mem_frag_ratio' }, { name => 'display' } ], output_template => 'Memory fragmentation ratio: %s', perfdatas => [ - { label => 'mem_frag_ratio', value => 'mem_frag_ratio_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'mem_frag_ratio', value => 'mem_frag_ratio', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -245,8 +245,8 @@ sub set_counters { key_values => [ { name => 'conns' }, { name => 'display' } ], output_template => 'Connections: %s', perfdatas => [ - { label => 'connections', value => 'conns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'connections', value => 'conns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -273,8 +273,8 @@ sub set_counters { key_values => [ { name => 'avg_latency' }, { name => 'display' } ], output_template => 'Average latency: %.2f ms', perfdatas => [ - { label => 'latency', value => 'avg_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'latency', value => 'avg_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -297,8 +297,8 @@ sub set_counters { key_values => [ { name => 'avg_other_latency' }, { name => 'display' } ], output_template => 'Other latency: %.2f ms', perfdatas => [ - { label => 'other_latency', value => 'avg_other_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'other_latency', value => 'avg_other_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -306,8 +306,8 @@ sub set_counters { key_values => [ { name => 'no_of_keys' }, { name => 'display' } ], output_template => 'Total keys: %s', perfdatas => [ - { label => 'keys', value => 'no_of_keys_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'keys', value => 'no_of_keys', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -315,8 +315,8 @@ sub set_counters { key_values => [ { name => 'evicted_objects' }, { name => 'display' } ], output_template => 'Evicted objects rate: %s evictions/sec', perfdatas => [ - { label => 'evicted_objects', value => 'evicted_objects_absolute', template => '%s', - min => 0, unit => 'evictions/sec', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'evicted_objects', value => 'evicted_objects', template => '%s', + min => 0, unit => 'evictions/sec', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -324,8 +324,8 @@ sub set_counters { key_values => [ { name => 'expired_objects' }, { name => 'display' } ], output_template => 'Expired objects rate: %s expirations/sec', perfdatas => [ - { label => 'expired_objects', value => 'expired_objects_absolute', template => '%s', - min => 0, unit => 'expirations/sec', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'expired_objects', value => 'expired_objects', template => '%s', + min => 0, unit => 'expirations/sec', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -352,8 +352,8 @@ sub set_counters { key_values => [ { name => 'avg_read_latency' }, { name => 'display' } ], output_template => 'Read latency: %.2f ms', perfdatas => [ - { label => 'read_latency', value => 'avg_read_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_latency', value => 'avg_read_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -380,8 +380,8 @@ sub set_counters { key_values => [ { name => 'avg_write_latency' }, { name => 'display' } ], output_template => 'Write latency: %.2f ms', perfdatas => [ - { label => 'write_latency', value => 'avg_write_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_latency', value => 'avg_write_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -390,8 +390,8 @@ sub set_counters { output_template => 'Traffic In: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'ingress_absolute', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', value => 'ingress', template => '%d', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], }, }, @@ -400,8 +400,8 @@ sub set_counters { output_template => 'Traffic Out: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'egress_absolute', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', value => 'egress', template => '%d', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], }, }, diff --git a/apps/redis/restapi/mode/nodesstats.pm b/apps/redis/restapi/mode/nodesstats.pm index 338896e9e..be1dcc4d5 100644 --- a/apps/redis/restapi/mode/nodesstats.pm +++ b/apps/redis/restapi/mode/nodesstats.pm @@ -134,8 +134,8 @@ sub set_counters { key_values => [ { name => 'shard_count' }, { name => 'display' } ], output_template => 'Shard count: %d', perfdatas => [ - { label => 'shard_count', value => 'shard_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'shard_count', value => 'shard_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], }, }, @@ -143,8 +143,8 @@ sub set_counters { key_values => [ { name => 'uptime' }, { name => 'uptime_sec' }, { name => 'display' } ], output_template => 'Uptime: %s', perfdatas => [ - { label => 'uptime', value => 'uptime_sec_absolute', template => '%d', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'uptime', value => 'uptime_sec', template => '%d', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], }, }, @@ -152,8 +152,8 @@ sub set_counters { key_values => [ { name => 'cpu_system' }, { name => 'display' } ], output_template => 'Cpu system: %.2f %%', perfdatas => [ - { label => 'cpu_system', value => 'cpu_system_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_system', value => 'cpu_system', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -161,8 +161,8 @@ sub set_counters { key_values => [ { name => 'cpu_user' }, { name => 'display' } ], output_template => 'Cpu user: %.2f %%', perfdatas => [ - { label => 'cpu_user', value => 'cpu_user_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_user', value => 'cpu_user', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -210,8 +210,8 @@ sub set_counters { key_values => [ { name => 'bigstore_iops' }, { name => 'display' } ], output_template => 'Flash IOPS: %s ops/s', perfdatas => [ - { label => 'flash_iops', value => 'bigstore_iops_absolute', template => '%s', - min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'flash_iops', value => 'bigstore_iops', template => '%s', + min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -220,8 +220,8 @@ sub set_counters { output_template => 'Flash throughput: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'flash_throughput', value => 'bigstore_throughput_absolute', template => '%s', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'flash_throughput', value => 'bigstore_throughput', template => '%s', + min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -229,8 +229,8 @@ sub set_counters { key_values => [ { name => 'conns' }, { name => 'display' } ], output_template => 'Connections: %s', perfdatas => [ - { label => 'connections', value => 'conns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'connections', value => 'conns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -238,7 +238,7 @@ sub set_counters { key_values => [ { name => 'total_req' } ], output_template => 'Requests rate: %s ops/s', perfdatas => [ - { label => 'requests', value => 'total_req_absolute', template => '%s', + { label => 'requests', value => 'total_req', template => '%s', min => 0, unit => 'ops/s' }, ], } @@ -248,8 +248,8 @@ sub set_counters { output_template => 'Traffic In: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'ingress_absolute', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', value => 'ingress', template => '%d', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], }, }, @@ -258,8 +258,8 @@ sub set_counters { output_template => 'Traffic Out: %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'egress_absolute', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', value => 'egress', template => '%d', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], }, }, diff --git a/apps/redis/restapi/mode/shardsstats.pm b/apps/redis/restapi/mode/shardsstats.pm index 4f405c1c8..6f63885b1 100644 --- a/apps/redis/restapi/mode/shardsstats.pm +++ b/apps/redis/restapi/mode/shardsstats.pm @@ -165,8 +165,8 @@ sub set_counters { output_template => 'Memory used: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'memory', value => 'used_memory_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'memory', value => 'used_memory', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -174,8 +174,8 @@ sub set_counters { key_values => [ { name => 'mem_frag_ratio' }, { name => 'display' } ], output_template => 'Memory fragmentation ratio: %s', perfdatas => [ - { label => 'mem_frag_ratio', value => 'mem_frag_ratio_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'mem_frag_ratio', value => 'mem_frag_ratio', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -183,8 +183,8 @@ sub set_counters { key_values => [ { name => 'connected_clients' }, { name => 'display' } ], output_template => 'Connected clients: %s', perfdatas => [ - { label => 'connected_clients', value => 'connected_clients_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'connected_clients', value => 'connected_clients', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -192,8 +192,8 @@ sub set_counters { key_values => [ { name => 'blocked_clients' }, { name => 'display' } ], output_template => 'Blocked clients: %s', perfdatas => [ - { label => 'blocked_clients', value => 'blocked_clients_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'blocked_clients', value => 'blocked_clients', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -201,8 +201,8 @@ sub set_counters { key_values => [ { name => 'total_req'}, { name => 'display' }], output_template => 'Requests rate: %s ops/s', perfdatas => [ - { label => 'requests', value => 'total_req_absolute', template => '%s', - min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'requests', value => 'total_req', template => '%s', + min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -210,8 +210,8 @@ sub set_counters { key_values => [ { name => 'no_of_keys' }, { name => 'display' } ], output_template => 'Total keys: %s', perfdatas => [ - { label => 'keys', value => 'no_of_keys_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'keys', value => 'no_of_keys', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -219,8 +219,8 @@ sub set_counters { key_values => [ { name => 'no_of_expires' }, { name => 'display' } ], output_template => 'Volatile keys: %s', perfdatas => [ - { label => 'volatile_keys', value => 'no_of_expires_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'volatile_keys', value => 'no_of_expires', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -228,8 +228,8 @@ sub set_counters { key_values => [ { name => 'evicted_objects' }, { name => 'display' } ], output_template => 'Evicted objects rate: %s evictions/sec', perfdatas => [ - { label => 'evicted_objects', value => 'evicted_objects_absolute', template => '%s', - min => 0, unit => 'evictions/sec', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'evicted_objects', value => 'evicted_objects', template => '%s', + min => 0, unit => 'evictions/sec', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -237,8 +237,8 @@ sub set_counters { key_values => [ { name => 'expired_objects' }, { name => 'display' } ], output_template => 'Expired objects rate: %s expirations/sec', perfdatas => [ - { label => 'expired_objects', value => 'expired_objects_absolute', template => '%s', - min => 0, unit => 'expirations/sec', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'expired_objects', value => 'expired_objects', template => '%s', + min => 0, unit => 'expirations/sec', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -274,8 +274,8 @@ sub set_counters { key_values => [ { name => 'rdb_changes_since_last_save' }, { name => 'display' } ], output_template => 'Rdb changes since last save: %s', perfdatas => [ - { label => 'rdb_changes_since_last_save', value => 'rdb_changes_since_last_save_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'rdb_changes_since_last_save', value => 'rdb_changes_since_last_save', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -283,8 +283,8 @@ sub set_counters { key_values => [ { name => 'last_save_time' }, { name => 'last_save_time_sec' }, { name => 'display' } ], output_template => 'Last same time: %s', perfdatas => [ - { label => 'last_save_time', value => 'last_save_time_sec_absolute', template => '%s', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'last_save_time', value => 'last_save_time_sec', template => '%s', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/rudder/restapi/mode/globalcompliance.pm b/apps/rudder/restapi/mode/globalcompliance.pm index 87fe115bd..eb229b590 100644 --- a/apps/rudder/restapi/mode/globalcompliance.pm +++ b/apps/rudder/restapi/mode/globalcompliance.pm @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'compliance' } ], output_template => 'Global Compliance: %.2f%%', perfdatas => [ - { label => 'global_compliance', value => 'compliance_absolute', template => '%.2f', + { label => 'global_compliance', value => 'compliance', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/apps/rudder/restapi/mode/nodecompliance.pm b/apps/rudder/restapi/mode/nodecompliance.pm index 7c22c0967..908018b82 100644 --- a/apps/rudder/restapi/mode/nodecompliance.pm +++ b/apps/rudder/restapi/mode/nodecompliance.pm @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => 'compliance' }, { name => 'display' } ], output_template => 'Compliance: %.2f%%', perfdatas => [ - { label => 'node_compliance', value => 'compliance_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'node_compliance', value => 'compliance', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/rudder/restapi/mode/rulecompliance.pm b/apps/rudder/restapi/mode/rulecompliance.pm index 2bc4c8c78..6c9c76123 100644 --- a/apps/rudder/restapi/mode/rulecompliance.pm +++ b/apps/rudder/restapi/mode/rulecompliance.pm @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'compliance' } ], output_template => 'Compliance: %.2f%%', perfdatas => [ - { label => 'rule_compliance', value => 'compliance_absolute', template => '%.2f', + { label => 'rule_compliance', value => 'compliance', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } diff --git a/apps/rudder/restapi/mode/statistics.pm b/apps/rudder/restapi/mode/statistics.pm index 34d2fff9f..a171745c2 100644 --- a/apps/rudder/restapi/mode/statistics.pm +++ b/apps/rudder/restapi/mode/statistics.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'nodes' } ], output_template => 'Nodes: %d', perfdatas => [ - { label => 'nodes', value => 'nodes_absolute', template => '%d', + { label => 'nodes', value => 'nodes', template => '%d', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'pending_nodes' } ], output_template => 'Pending Nodes: %d', perfdatas => [ - { label => 'pending_nodes', value => 'pending_nodes_absolute', template => '%d', + { label => 'pending_nodes', value => 'pending_nodes', template => '%d', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'rules' } ], output_template => 'Rules: %d', perfdatas => [ - { label => 'rules', value => 'rules_absolute', template => '%d', + { label => 'rules', value => 'rules', template => '%d', min => 0 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'directives' } ], output_template => 'Directives: %d', perfdatas => [ - { label => 'directives', value => 'directives_absolute', template => '%d', + { label => 'directives', value => 'directives', template => '%d', min => 0 }, ], } @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => 'groups' } ], output_template => 'Groups: %d', perfdatas => [ - { label => 'groups', value => 'groups_absolute', template => '%d', + { label => 'groups', value => 'groups', template => '%d', min => 0 }, ], } @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => 'techniques' } ], output_template => 'Techniques: %d', perfdatas => [ - { label => 'techniques', value => 'techniques_absolute', template => '%d', + { label => 'techniques', value => 'techniques', template => '%d', min => 0 }, ], } diff --git a/apps/sahipro/restapi/mode/scenario.pm b/apps/sahipro/restapi/mode/scenario.pm index b751c1dc0..14adc9dc8 100644 --- a/apps/sahipro/restapi/mode/scenario.pm +++ b/apps/sahipro/restapi/mode/scenario.pm @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'time_taken' } ], output_template => 'execution time : %s ms', perfdatas => [ - { label => 'total_time', value => 'time_taken_absolute', template => '%s', min => 0, unit => 'ms' }, + { label => 'total_time', value => 'time_taken', template => '%s', min => 0, unit => 'ms' }, ], } }, @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'total_steps' } ], output_template => 'total steps : %s', perfdatas => [ - { label => 'total_steps', value => 'total_steps_absolute', template => '%s', min => 0 }, + { label => 'total_steps', value => 'total_steps', template => '%s', min => 0 }, ], } }, @@ -91,7 +91,7 @@ sub set_counters { key_values => [ { name => 'failures' } ], output_template => 'failures : %s', perfdatas => [ - { label => 'failures', value => 'failures_absolute', template => '%s', min => 0 }, + { label => 'failures', value => 'failures', template => '%s', min => 0 }, ], } }, @@ -99,7 +99,7 @@ sub set_counters { key_values => [ { name => 'errors' } ], output_template => 'errors : %s', perfdatas => [ - { label => 'errors', value => 'errors_absolute', template => '%s', min => 0 }, + { label => 'errors', value => 'errors', template => '%s', min => 0 }, ], } }, @@ -110,8 +110,8 @@ sub set_counters { key_values => [ { name => 'time_taken' }, { name => 'step' } ], output_template => 'execution time : %s ms', perfdatas => [ - { label => 'step_time', value => 'time_taken_absolute', template => '%s', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'step_absolute' }, + { label => 'step_time', value => 'time_taken', template => '%s', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'step' }, ], } }, diff --git a/apps/salesforce/restapi/mode/sfdcinstance.pm b/apps/salesforce/restapi/mode/sfdcinstance.pm index aea61d55c..73bd954b4 100644 --- a/apps/salesforce/restapi/mode/sfdcinstance.pm +++ b/apps/salesforce/restapi/mode/sfdcinstance.pm @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'incident' } ], output_template => '%s incidents currently', perfdatas => [ - { label => 'incident', value => 'incident_absolute', template => '%s', + { label => 'incident', value => 'incident', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/selenium/mode/scenariokatalon.pm b/apps/selenium/mode/scenariokatalon.pm index 754f303fd..e178b3405 100644 --- a/apps/selenium/mode/scenariokatalon.pm +++ b/apps/selenium/mode/scenariokatalon.pm @@ -147,7 +147,7 @@ sub set_counters { key_values => [ { name => 'time_scenario' } ], output_template => 'Total execution time : %.2f ms', perfdatas => [ - { label => 'time_scenario', value => 'time_scenario_absolute', template => '%.2f', + { label => 'time_scenario', value => 'time_scenario', template => '%.2f', min => 0, unit => 'ms' }, ], } @@ -168,8 +168,8 @@ sub set_counters { key_values => [ { name => 'time_step' }, { name => 'display' } ], output_template => 'Execution time : %.2f ms', perfdatas => [ - { label => 'time_step', value => 'time_step_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'time_step', value => 'time_step', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/slack/restapi/mode/countchannels.pm b/apps/slack/restapi/mode/countchannels.pm index 4bb935bbb..f11fca915 100644 --- a/apps/slack/restapi/mode/countchannels.pm +++ b/apps/slack/restapi/mode/countchannels.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Number of channels : %d', perfdatas => [ - { label => 'count', value => 'count_absolute', template => '%d', + { label => 'count', value => 'count', template => '%d', min => 0 }, ], } diff --git a/apps/slack/restapi/mode/countmembers.pm b/apps/slack/restapi/mode/countmembers.pm index 334c23610..20dd271b4 100644 --- a/apps/slack/restapi/mode/countmembers.pm +++ b/apps/slack/restapi/mode/countmembers.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Number of members : %d', perfdatas => [ - { label => 'count', value => 'count_absolute', template => '%d', + { label => 'count', value => 'count', template => '%d', min => 0 }, ], } diff --git a/apps/squid/snmp/mode/cacheusage.pm b/apps/squid/snmp/mode/cacheusage.pm index 84ffa9496..98df69c33 100644 --- a/apps/squid/snmp/mode/cacheusage.pm +++ b/apps/squid/snmp/mode/cacheusage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cacheCpuUsage' } ], output_template => 'Cpu usage : %s %%', perfdatas => [ - { label => 'cpu', value => 'cacheCpuUsage_absolute', template => '%s', + { label => 'cpu', value => 'cacheCpuUsage', template => '%s', min => 0, max => 100, unit => '%' }, ], } @@ -47,7 +47,7 @@ sub set_counters { output_template => 'Memory usage : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'memory', value => 'cacheMemUsage_absolute', template => '%s', + { label => 'memory', value => 'cacheMemUsage', template => '%s', min => 0, unit => 'B' }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'cacheCurrentFileDescrCnt' } ], output_template => 'Number of file descriptors : %s', perfdatas => [ - { label => 'fd', value => 'cacheCurrentFileDescrCnt_absolute', template => '%s', + { label => 'fd', value => 'cacheCurrentFileDescrCnt', template => '%s', min => 0 }, ], } @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'cacheNumObjCount' } ], output_template => 'Number of object stored : %s', perfdatas => [ - { label => 'objects', value => 'cacheNumObjCount_absolute', template => '%s', + { label => 'objects', value => 'cacheNumObjCount', template => '%s', min => 0 }, ], } diff --git a/apps/squid/snmp/mode/protocolstats.pm b/apps/squid/snmp/mode/protocolstats.pm index 9ec1fe0cb..26709a4d9 100644 --- a/apps/squid/snmp/mode/protocolstats.pm +++ b/apps/squid/snmp/mode/protocolstats.pm @@ -63,27 +63,27 @@ sub set_counters { key_values => [ { name => 'cacheHttpErrors', diff => 1 } ], output_template => 'errors : %s', perfdatas => [ - { label => 'http_errors', value => 'cacheHttpErrors_absolute', template => '%s', + { label => 'http_errors', template => '%s', min => 0 }, ], } }, { label => 'http-traffic-in', set => { - key_values => [ { name => 'cacheHttpInKb', diff => 1 } ], + key_values => [ { name => 'cacheHttpInKb', per_second => 1 } ], output_template => 'traffic in : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'http_traffic_in', value => 'cacheHttpInKb_per_second', template => '%s', + { label => 'http_traffic_in', template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'http-traffic-out', set => { - key_values => [ { name => 'cacheHttpOutKb', diff => 1 } ], + key_values => [ { name => 'cacheHttpOutKb', per_second => 1 } ], output_template => 'traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'http_traffic_out', value => 'cacheHttpOutKb_per_second', template => '%s', + { label => 'http_traffic_out', template => '%s', min => 0, unit => 'b/s' }, ], } @@ -92,21 +92,21 @@ sub set_counters { $self->{maps_counters}->{global_icp} = [ { label => 'icp-traffic-in', set => { - key_values => [ { name => 'cacheIcpKbRecv', diff => 1 } ], + key_values => [ { name => 'cacheIcpKbRecv', per_second => 1 } ], output_template => 'traffic in : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'icp_traffic_in', value => 'cacheIcpKbRecv_per_second', template => '%s', + { label => 'icp_traffic_in', template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'icp-traffic-out', set => { - key_values => [ { name => 'cacheIcpKbSent', diff => 1 } ], + key_values => [ { name => 'cacheIcpKbSent', per_second => 1 } ], output_template => 'traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'icp_traffic_out', value => 'cacheIcpKbSent_per_second', template => '%s', + { label => 'icp_traffic_out', template => '%s', min => 0, unit => 'b/s' }, ], } @@ -115,21 +115,21 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'server-traffic-in', set => { - key_values => [ { name => 'cacheServerInKb', diff => 1 } ], + key_values => [ { name => 'cacheServerInKb', per_second => 1 } ], output_template => 'traffic in : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'server_traffic_in', value => 'cacheServerInKb_per_second', template => '%s', + { label => 'server_traffic_in', template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'server-traffic-out', set => { - key_values => [ { name => 'cacheServerOutKb', diff => 1 } ], + key_values => [ { name => 'cacheServerOutKb', per_second => 1 } ], output_template => 'traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'server_traffic_out', value => 'cacheServerOutKb_per_second', template => '%s', + { label => 'server_traffic_out', template => '%s', min => 0, unit => 'b/s' }, ], } @@ -138,11 +138,10 @@ sub set_counters { key_values => [ { name => 'cacheClients' } ], output_template => 'current number of clients : %s', perfdatas => [ - { label => 'clients', value => 'cacheClients_absolute', template => '%s', - min => 0 }, - ], + { label => 'clients', template => '%s', min => 0 }, + ] } - }, + } ]; } @@ -171,7 +170,7 @@ sub new { $options{options}->add_options(arguments => { }); - + return $self; } diff --git a/apps/tomcat/jmx/mode/connectorusage.pm b/apps/tomcat/jmx/mode/connectorusage.pm index b04963209..412140f34 100644 --- a/apps/tomcat/jmx/mode/connectorusage.pm +++ b/apps/tomcat/jmx/mode/connectorusage.pm @@ -56,32 +56,31 @@ sub set_counters { key_values => [ { name => 'requestCount', diff => 1 }, { name => 'display' } ], output_template => 'Request Count : %s', perfdatas => [ - { label => 'request_count', value => 'requestCount_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'request_count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'bytesReceived', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'bytesReceived', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic In : %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'bytesReceived_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'bytesSent', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'bytesSent', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic Out : %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'bytesSent_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } - }, - + } ]; } @@ -165,8 +164,8 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "units:s" => { name => 'units', default => '%' }, + 'filter-name:s' => { name => 'filter_name' }, + 'units:s' => { name => 'units', default => '%' }, }); return $self; diff --git a/apps/tomcat/jmx/mode/webappssessions.pm b/apps/tomcat/jmx/mode/webappssessions.pm index 4f8f83d59..30659ec4b 100644 --- a/apps/tomcat/jmx/mode/webappssessions.pm +++ b/apps/tomcat/jmx/mode/webappssessions.pm @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'sessionCounter', diff => 1 }, { name => 'display' } ], output_template => 'Sessions Count : %s', perfdatas => [ - { label => 'sessions_count', value => 'sessionCounter_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'sessions_count', value => 'sessionCounter', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/tomcat/web/mode/applications.pm b/apps/tomcat/web/mode/applications.pm index 07db0afd2..c23cde3a9 100644 --- a/apps/tomcat/web/mode/applications.pm +++ b/apps/tomcat/web/mode/applications.pm @@ -54,8 +54,8 @@ sub set_counters { key_values => [ { name => 'sessions' }, { name => 'display' } ], output_template => 'active sessions: %s', perfdatas => [ - { value => 'sessions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'sessions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/tomcat/web/mode/connectors.pm b/apps/tomcat/web/mode/connectors.pm index 578215cc9..0ae52cd92 100644 --- a/apps/tomcat/web/mode/connectors.pm +++ b/apps/tomcat/web/mode/connectors.pm @@ -38,10 +38,12 @@ sub custom_traffic_output { ($total_value, $total_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{speed}, network => 1); } - my $msg = sprintf("Traffic %s : %s/s (%s on %s)", - ucfirst($self->{result_values}->{label}), $traffic_value . $traffic_unit, - defined($self->{result_values}->{traffic_prct}) ? sprintf("%.2f%%", $self->{result_values}->{traffic_prct}) : '-', - defined($total_value) ? $total_value . $total_unit : '-'); + my $msg = sprintf( + "Traffic %s : %s/s (%s on %s)", + ucfirst($self->{result_values}->{label}), $traffic_value . $traffic_unit, + defined($self->{result_values}->{traffic_prct}) ? sprintf("%.2f%%", $self->{result_values}->{traffic_prct}) : '-', + defined($total_value) ? $total_value . $total_unit : '-' + ); return $msg; } @@ -73,7 +75,7 @@ sub set_counters { key_values => [ { name => 'currentThreadCount' }, { name => 'maxThreads' }, { name => 'display' } ], output_template => 'Threads Current : %s', perfdatas => [ - { label => 'threads_current', value => 'currentThreadCount_absolute', template => '%.2f', min => 0, max => 'maxThreads_absolute', + { label => 'threads_current', template => '%.2f', min => 0, max => 'maxThreads', label_extra_instance => 1 }, ], } @@ -82,14 +84,13 @@ sub set_counters { key_values => [ { name => 'currentThreadsBusy' }, { name => 'maxThreads' }, { name => 'display' } ], output_template => 'Threads Busy : %s', perfdatas => [ - { label => 'threads_busy', value => 'currentThreadsBusy_absolute', template => '%.2f', min => 0, max => 'maxThreads_absolute', + { label => 'threads_busy', template => '%.2f', min => 0, max => 'maxThreads', label_extra_instance => 1 }, ], } }, { label => 'traffic-in', nlabel => 'connector.traffic.in.bitspersecond', set => { key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_traffic_output'), threshold_use => 'traffic', @@ -101,7 +102,6 @@ sub set_counters { }, { label => 'traffic-in-prct', display_ok => 0, nlabel => 'connector.traffic.in.percent', set => { key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in', type => 'prct' }, output_template => 'Traffic In Used : %.2f %%', output_use => 'traffic_prct', threshold_use => 'traffic_prct', @@ -113,7 +113,6 @@ sub set_counters { }, { label => 'traffic-out', nlabel => 'connector.traffic.out.bitspersecond', set => { key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_traffic_output'), threshold_use => 'traffic', @@ -125,7 +124,6 @@ sub set_counters { }, { label => 'traffic-out-prct', display_ok => 0, nlabel => 'connector.traffic.out.percent', set => { key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out', type => 'prct' }, output_template => 'Traffic Out Used : %.2f %%', output_use => 'traffic_prct', threshold_use => 'traffic_prct', @@ -139,7 +137,7 @@ sub set_counters { key_values => [ { name => 'requestInfo_processingTime', diff => 1 }, { name => 'display' } ], output_template => 'Requests Total Processing Time : %s ms', perfdatas => [ - { label => 'requests_processingtime_total', value => 'requestInfo_processingTime_absolute', template => '%s', min => 0, + { label => 'requests_processingtime_total', template => '%s', min => 0, unit => 'ms', label_extra_instance => 1 }, ], } @@ -148,7 +146,7 @@ sub set_counters { key_values => [ { name => 'requestInfo_errorCount', diff => 1 }, { name => 'display' } ], output_template => 'Requests Errors : %s', perfdatas => [ - { label => 'requests_errors', value => 'requestInfo_errorCount_absolute', template => '%s', min => 0, + { label => 'requests_errors', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -157,7 +155,7 @@ sub set_counters { key_values => [ { name => 'requestInfo_requestCount', diff => 1 }, { name => 'display' } ], output_template => 'Requests Total : %s', perfdatas => [ - { label => 'requests_total', value => 'requestInfo_requestCount_absolute', template => '%s', min => 0, + { label => 'requests_total', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/tomcat/web/mode/memory.pm b/apps/tomcat/web/mode/memory.pm index a6e112c14..edaf048cd 100644 --- a/apps/tomcat/web/mode/memory.pm +++ b/apps/tomcat/web/mode/memory.pm @@ -31,11 +31,11 @@ sub custom_memory_output { my ($self, %options) = @_; my $msg = sprintf("Memory Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute}); + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free}); return $msg; } @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_memory_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_memory_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Memory Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/apps/toshiba/storemate/sql/mode/posstatus.pm b/apps/toshiba/storemate/sql/mode/posstatus.pm index 5fc0c3511..43cf06b99 100644 --- a/apps/toshiba/storemate/sql/mode/posstatus.pm +++ b/apps/toshiba/storemate/sql/mode/posstatus.pm @@ -40,7 +40,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'online' } ], output_template => 'online : %s', perfdatas => [ - { label => 'online', value => 'online_absolute', template => '%s', + { label => 'online', value => 'online', template => '%s', min => 0 }, ], } @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'offline' } ], output_template => 'offline : %s', perfdatas => [ - { label => 'offline', value => 'offline_absolute', template => '%s', + { label => 'offline', value => 'offline', template => '%s', min => 0 }, ], } @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'unknown' } ], output_template => 'unknown : %s', perfdatas => [ - { label => 'state_unknown', value => 'unknown_absolute', template => '%s', + { label => 'state_unknown', value => 'unknown', template => '%s', min => 0 }, ], } @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'signoff' } ], output_template => 'signed off : %s', perfdatas => [ - { label => 'state_signoff', value => 'signoff_absolute', template => '%s', + { label => 'state_signoff', value => 'signoff', template => '%s', min => 0 }, ], } @@ -88,7 +88,7 @@ sub set_counters { key_values => [ { name => 'signon' } ], output_template => 'signed on : %s', perfdatas => [ - { label => 'state_signon', value => 'signon_absolute', template => '%s', + { label => 'state_signon', value => 'signon', template => '%s', min => 0 }, ], } @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => 'closed' } ], output_template => 'closed : %s', perfdatas => [ - { label => 'state_closed', value => 'closed_absolute', template => '%s', + { label => 'state_closed', value => 'closed', template => '%s', min => 0 }, ], } @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'paused' } ], output_template => 'paused : %s', perfdatas => [ - { label => 'state_paused', value => 'paused_absolute', template => '%s', + { label => 'state_paused', value => 'paused', template => '%s', min => 0 }, ], } @@ -118,7 +118,7 @@ sub set_counters { key_values => [ { name => 'unknown' } ], output_template => 'unknown : %s', perfdatas => [ - { label => 'merchandise_rep_unknown', value => 'unknown_absolute', template => '%s', + { label => 'merchandise_rep_unknown', value => 'unknown', template => '%s', min => 0 }, ], } @@ -127,7 +127,7 @@ sub set_counters { key_values => [ { name => 'ok' } ], output_template => 'ok : %s', perfdatas => [ - { label => 'merchandise_rep_ok', value => 'ok_absolute', template => '%s', + { label => 'merchandise_rep_ok', value => 'ok', template => '%s', min => 0 }, ], } @@ -136,7 +136,7 @@ sub set_counters { key_values => [ { name => 'suspended' } ], output_template => 'suspended : %s', perfdatas => [ - { label => 'merchandise_rep_suspended', value => 'suspended_absolute', template => '%s', + { label => 'merchandise_rep_suspended', value => 'suspended', template => '%s', min => 0 }, ], } @@ -145,7 +145,7 @@ sub set_counters { key_values => [ { name => 'error' } ], output_template => 'error : %s', perfdatas => [ - { label => 'merchandise_rep_error', value => 'error_absolute', template => '%s', + { label => 'merchandise_rep_error', value => 'error', template => '%s', min => 0 }, ], } @@ -157,7 +157,7 @@ sub set_counters { key_values => [ { name => 'unknown' } ], output_template => 'unknown : %s', perfdatas => [ - { label => 'transaction_rep_unknown', value => 'unknown_absolute', template => '%s', + { label => 'transaction_rep_unknown', value => 'unknown', template => '%s', min => 0 }, ], } @@ -166,7 +166,7 @@ sub set_counters { key_values => [ { name => 'ok' } ], output_template => 'ok : %s', perfdatas => [ - { label => 'transaction_rep_ok', value => 'ok_absolute', template => '%s', + { label => 'transaction_rep_ok', value => 'ok', template => '%s', min => 0 }, ], } @@ -175,7 +175,7 @@ sub set_counters { key_values => [ { name => 'suspended' } ], output_template => 'suspended : %s', perfdatas => [ - { label => 'transaction_rep_suspended', value => 'suspended_absolute', template => '%s', + { label => 'transaction_rep_suspended', value => 'suspended', template => '%s', min => 0 }, ], } @@ -184,7 +184,7 @@ sub set_counters { key_values => [ { name => 'error' } ], output_template => 'error : %s', perfdatas => [ - { label => 'transaction_rep_error', value => 'error_absolute', template => '%s', + { label => 'transaction_rep_error', value => 'error', template => '%s', min => 0 }, ], } diff --git a/apps/varnish/local/mode/stats.pm b/apps/varnish/local/mode/stats.pm index 2d6ebd296..b635c400f 100644 --- a/apps/varnish/local/mode/stats.pm +++ b/apps/varnish/local/mode/stats.pm @@ -30,27 +30,27 @@ sub configure_varnish_stats { my ($self, %options) = @_; $self->{varnish_stats} = [ - { entry => 'client_conn', nlabel => 'connections.client.accepted.persecond', display_ok => 1, diff => 1, per_second => 1 }, - { entry => 'client_drop', nlabel => 'connections.client.dropped.persecond', display_ok => 1, diff => 1, per_second => 1 }, - { entry => 'client_req', nlabel => 'connections.client.request.received.persecond', display_ok => 1, diff => 1, per_second => 1 }, - { entry => 'client_drop_late', nlabel => 'connections.client.dropped.late.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'client_req_400', nlabel => 'connections.client.request400.received.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'client_req_411', nlabel => 'connections.client.request411.received.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'client_req_413', nlabel => 'connections.client.request413.received.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'client_req_417', nlabel => 'connections.client.request417.received.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'client_conn', nlabel => 'connections.client.accepted.persecond', display_ok => 1, per_second => 1 }, + { entry => 'client_drop', nlabel => 'connections.client.dropped.persecond', display_ok => 1, per_second => 1 }, + { entry => 'client_req', nlabel => 'connections.client.request.received.persecond', display_ok => 1, per_second => 1 }, + { entry => 'client_drop_late', nlabel => 'connections.client.dropped.late.persecond', display_ok => 0, per_second => 1 }, + { entry => 'client_req_400', nlabel => 'connections.client.request400.received.persecond', display_ok => 0, per_second => 1 }, + { entry => 'client_req_411', nlabel => 'connections.client.request411.received.persecond', display_ok => 0, per_second => 1 }, + { entry => 'client_req_413', nlabel => 'connections.client.request413.received.persecond', display_ok => 0, per_second => 1 }, + { entry => 'client_req_417', nlabel => 'connections.client.request417.received.persecond', display_ok => 0, per_second => 1 }, - { entry => 'backend_conn', nlabel => 'backends.connections.success.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'backend_unhealthy', nlabel => 'backends.connections.unhealthy.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'backend_busy', nlabel => 'backends.connections.busy.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'backend_fail', nlabel => 'backends.connections.fail.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'backend_reuse', nlabel => 'backends.connections.reuse.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'backend_recycle', nlabel => 'backends.connections.recycle.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'backend_retry', nlabel => 'backends.connections.retry.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'backend_req', nlabel => 'backends.requests.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'backend_conn', nlabel => 'backends.connections.success.persecond', display_ok => 0, per_second => 1 }, + { entry => 'backend_unhealthy', nlabel => 'backends.connections.unhealthy.persecond', display_ok => 0, per_second => 1 }, + { entry => 'backend_busy', nlabel => 'backends.connections.busy.persecond', display_ok => 0, per_second => 1 }, + { entry => 'backend_fail', nlabel => 'backends.connections.fail.persecond', display_ok => 0, per_second => 1 }, + { entry => 'backend_reuse', nlabel => 'backends.connections.reuse.persecond', display_ok => 0, per_second => 1 }, + { entry => 'backend_recycle', nlabel => 'backends.connections.recycle.persecond', display_ok => 0, per_second => 1 }, + { entry => 'backend_retry', nlabel => 'backends.connections.retry.persecond', display_ok => 0, per_second => 1 }, + { entry => 'backend_req', nlabel => 'backends.requests.persecond', display_ok => 0, per_second => 1 }, - { entry => 'cache_hit', nlabel => 'cache.hit.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'cache_hitpass', nlabel => 'cache.hitpass.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'cache_miss', nlabel => 'cache.miss.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'cache_hit', nlabel => 'cache.hit.persecond', display_ok => 0, per_second => 1 }, + { entry => 'cache_hitpass', nlabel => 'cache.hitpass.persecond', display_ok => 0, per_second => 1 }, + { entry => 'cache_miss', nlabel => 'cache.miss.persecond', display_ok => 0, per_second => 1 }, { entry => 'n_sess_mem', nlabel => 'structure.session.memory.count', display_ok => 0 }, { entry => 'n_sess', nlabel => 'structure.session.count', display_ok => 0 }, @@ -66,53 +66,53 @@ sub configure_varnish_stats { { entry => 'n_lru_nuked', nlabel => 'object.lru.nuked.count', display_ok => 0 }, { entry => 'n_lru_moved', nlabel => 'object.lru.moved.count', display_ok => 0 }, - { entry => 'n_objsendfile', nlabel => 'object.sent.file.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'n_objwrite', nlabel => 'object.sent.write.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'n_objoverflow', nlabel => 'object.overflow.workspace.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'n_objsendfile', nlabel => 'object.sent.file.persecond', display_ok => 0, per_second => 1 }, + { entry => 'n_objwrite', nlabel => 'object.sent.write.persecond', display_ok => 0, per_second => 1 }, + { entry => 'n_objoverflow', nlabel => 'object.overflow.workspace.persecond', display_ok => 0, per_second => 1 }, - { entry => 'shm_records', nlabel => 'shm.records.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'shm_writes', nlabel => 'shm.writes.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'shm_flushes', nlabel => 'shm.flushes.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'shm_cont', nlabel => 'shm.contentions.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'shm_cycles', nlabel => 'shm.cycles.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'shm_records', nlabel => 'shm.records.persecond', display_ok => 0, per_second => 1 }, + { entry => 'shm_writes', nlabel => 'shm.writes.persecond', display_ok => 0, per_second => 1 }, + { entry => 'shm_flushes', nlabel => 'shm.flushes.persecond', display_ok => 0, per_second => 1 }, + { entry => 'shm_cont', nlabel => 'shm.contentions.persecond', display_ok => 0, per_second => 1 }, + { entry => 'shm_cycles', nlabel => 'shm.cycles.persecond', display_ok => 0, per_second => 1 }, - { entry => 'sms_nreq', nlabel => 'sms.allocator.requests.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'sms_nreq', nlabel => 'sms.allocator.requests.persecond', display_ok => 0, per_second => 1 }, { entry => 'sms_nobj', nlabel => 'sms.outstanding.allocations.count', display_ok => 0 }, { entry => 'sms_nbytes', nlabel => 'sms.outstanding.bytes', display_ok => 0, custom_output => $self->can('custom_output_scale_bytes') }, { entry => 'sms_balloc', nlabel => 'sms.outstanding.allocated.bytes', display_ok => 0, custom_output => $self->can('custom_output_scale_bytes') }, { entry => 'sms_bfree', nlabel => 'sms.outstanding.freed.bytes', display_ok => 0, custom_output => $self->can('custom_output_scale_bytes') }, - { entry => 'fetch_head', nlabel => 'fetch.head.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_length', nlabel => 'fetch.length.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_chunked', nlabel => 'fetch.chunked.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_eof', nlabel => 'fetch.eof.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_bad', nlabel => 'fetch.badheaders.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_close', nlabel => 'fetch.close.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_oldhttp', nlabel => 'fetch.oldhttp.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_zero', nlabel => 'fetch.zero.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_failed', nlabel => 'fetch.failed.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_1xx', nlabel => 'fetch.1xx.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_204', nlabel => 'fetch.204.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'fetch_304', nlabel => 'fetch.304.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'fetch_head', nlabel => 'fetch.head.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_length', nlabel => 'fetch.length.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_chunked', nlabel => 'fetch.chunked.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_eof', nlabel => 'fetch.eof.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_bad', nlabel => 'fetch.badheaders.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_close', nlabel => 'fetch.close.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_oldhttp', nlabel => 'fetch.oldhttp.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_zero', nlabel => 'fetch.zero.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_failed', nlabel => 'fetch.failed.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_1xx', nlabel => 'fetch.1xx.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_204', nlabel => 'fetch.204.persecond', display_ok => 0, per_second => 1 }, + { entry => 'fetch_304', nlabel => 'fetch.304.persecond', display_ok => 0, per_second => 1 }, { entry => 'n_ban', nlabel => 'ban.total.active.count', display_ok => 0 }, - { entry => 'n_ban_add', nlabel => 'ban.new.added.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'n_ban_retire', nlabel => 'ban.old.deleted.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'n_ban_obj_test', nlabel => 'ban.object.tested.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'n_ban_re_test', nlabel => 'ban.object.tested.regexp.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'n_ban_dups', nlabel => 'ban.duplicate.removed.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'n_ban_add', nlabel => 'ban.new.added.persecond', display_ok => 0, per_second => 1 }, + { entry => 'n_ban_retire', nlabel => 'ban.old.deleted.persecond', display_ok => 0, per_second => 1 }, + { entry => 'n_ban_obj_test', nlabel => 'ban.object.tested.persecond', display_ok => 0, per_second => 1 }, + { entry => 'n_ban_re_test', nlabel => 'ban.object.tested.regexp.persecond', display_ok => 0, per_second => 1 }, + { entry => 'n_ban_dups', nlabel => 'ban.duplicate.removed.persecond', display_ok => 0, per_second => 1 }, - { entry => 'dir_dns_lookups', nlabel => 'dns.director.lookups.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'dir_dns_failed', nlabel => 'dns.director.lookups.failed.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'dir_dns_hit', nlabel => 'dns.director.lookups.cachehit.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'dir_dns_cache_full', nlabel => 'dns.director.cache.full.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'dir_dns_lookups', nlabel => 'dns.director.lookups.persecond', display_ok => 0, per_second => 1 }, + { entry => 'dir_dns_failed', nlabel => 'dns.director.lookups.failed.persecond', display_ok => 0, per_second => 1 }, + { entry => 'dir_dns_hit', nlabel => 'dns.director.lookups.cachehit.persecond', display_ok => 0, per_second => 1 }, + { entry => 'dir_dns_cache_full', nlabel => 'dns.director.cache.full.persecond', display_ok => 0, per_second => 1 }, - { entry => 'esi_errors', nlabel => 'esi.parse.errors.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'esi_warnings', nlabel => 'esi.parse.warnings.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'esi_errors', nlabel => 'esi.parse.errors.persecond', display_ok => 0, per_second => 1 }, + { entry => 'esi_warnings', nlabel => 'esi.parse.warnings.persecond', display_ok => 0, per_second => 1 }, - { entry => 'hcb_nolock', nlabel => 'hck.lookups.nolock.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'hcb_lock', nlabel => 'hck.lookups.lock.persecond', display_ok => 0, diff => 1, per_second => 1 }, - { entry => 'hcb_insert', nlabel => 'hck.inserts.persecond', display_ok => 0, diff => 1, per_second => 1 }, + { entry => 'hcb_nolock', nlabel => 'hck.lookups.nolock.persecond', display_ok => 0, per_second => 1 }, + { entry => 'hcb_lock', nlabel => 'hck.lookups.lock.persecond', display_ok => 0, per_second => 1 }, + { entry => 'hcb_insert', nlabel => 'hck.inserts.persecond', display_ok => 0, per_second => 1 }, { entry => 'n_vcl', nlabel => 'vlc.total.count', display_ok => 0, diff => 1 }, { entry => 'n_vcl_avail', nlabel => 'vlc.available.count', display_ok => 0, diff => 1 }, @@ -147,7 +147,7 @@ sub configure_varnish_stats { { entry => 'n_wrk_max', nlabel => 'workers.threads.limited.count', display_ok => 0, diff => 1 }, { entry => 'n_wrk_lqueue', nlabel => 'workers.requests.queue.length.count', display_ok => 0, diff => 1 }, { entry => 'n_wrk_queued', nlabel => 'workers.requests.queued.count', display_ok => 0, diff => 1 }, - { entry => 'n_wrk_drop', nlabel => 'workers.requests.dropped.count', display_ok => 0, diff => 1 }, + { entry => 'n_wrk_drop', nlabel => 'workers.requests.dropped.count', display_ok => 0, diff => 1 } ]; } @@ -156,9 +156,8 @@ sub custom_output_scale_bytes { my $label = $self->{label}; $label =~ s/-/_/g; - my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{$label . '_absolute'}); - my $msg = sprintf('%s: %.2f %s', $self->{result_values}->{$label . '_description_absolute'}, $value, $unit); - return $msg; + my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{$label }); + return sprintf('%s: %.2f %s', $self->{result_values}->{$label . '_description'}, $value, $unit); } sub custom_output_second { @@ -166,7 +165,7 @@ sub custom_output_second { my $label = $self->{label}; $label =~ s/-/_/g; - my $msg = sprintf('%s: %.2f/s', $self->{result_values}->{$label . '_description_absolute'}, $self->{result_values}->{$label . '_per_second'}); + my $msg = sprintf('%s: %.2f/s', $self->{result_values}->{$label . '_description'}, $self->{result_values}->{$label}); return $msg; } @@ -175,7 +174,7 @@ sub custom_output { my $label = $self->{label}; $label =~ s/-/_/g; - my $msg = sprintf('%s: %s', $self->{result_values}->{$label . '_description_absolute'}, $self->{result_values}->{$label . '_absolute'}); + my $msg = sprintf('%s: %s', $self->{result_values}->{$label . '_description'}, $self->{result_values}->{$label }); return $msg; } @@ -185,7 +184,7 @@ sub set_counters { $self->configure_varnish_stats(); $self->{maps_counters_type} = [ - { name => 'global', type => 0, skipped_code => { -10 => 1 } }, + { name => 'global', type => 0, skipped_code => { -10 => 1 } } ]; $self->{maps_counters}->{global} = []; @@ -194,12 +193,11 @@ sub set_counters { $label =~ s/_/-/g; push @{$self->{maps_counters}->{global}}, { label => $label, nlabel => $_->{nlabel}, display_ok => $_->{display_ok}, set => { - key_values => [ { name => $_->{entry}, diff => $_->{diff} }, { name => $_->{entry}. '_description' } ], + key_values => [ { name => $_->{entry}, diff => $_->{diff}, per_second => $_->{per_second} }, { name => $_->{entry}. '_description' } ], closure_custom_output => defined($_->{custom_output}) ? $_->{custom_output} : (defined($_->{per_second}) ? $self->can('custom_output_second') : $self->can('custom_output')), - per_second => $_->{per_second}, perfdatas => [ - { label => $_->{entry}, value => $_->{entry} . (defined($_->{per_second}) ? '_per_second' : '_absolute'), + { label => $_->{entry}, template => defined($_->{per_second}) ? '%.2f' : '%s', min => 0 }, ], @@ -224,7 +222,7 @@ sub new { 'sudo' => { name => 'sudo' }, 'command:s' => { name => 'command', default => 'varnishstat' }, 'command-path:s' => { name => 'command_path', default => '/usr/bin' }, - 'command-options:s' => { name => 'command_options', default => ' -1 -j 2>&1' }, + 'command-options:s' => { name => 'command_options', default => ' -1 -j 2>&1' } }); return $self; diff --git a/apps/video/openheadend/snmp/mode/nodeusage.pm b/apps/video/openheadend/snmp/mode/nodeusage.pm index 801ac4e45..3a7e3aaed 100644 --- a/apps/video/openheadend/snmp/mode/nodeusage.pm +++ b/apps/video/openheadend/snmp/mode/nodeusage.pm @@ -62,8 +62,8 @@ sub set_counters { output_template => 'bitRate : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'bitrate', value => 'nodeBitrate_absolute', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'bitrate', value => 'nodeBitrate', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/video/zixi/restapi/mode/broadcasterinputusage.pm b/apps/video/zixi/restapi/mode/broadcasterinputusage.pm index f62ba7ce7..061b9f7ab 100644 --- a/apps/video/zixi/restapi/mode/broadcasterinputusage.pm +++ b/apps/video/zixi/restapi/mode/broadcasterinputusage.pm @@ -61,25 +61,25 @@ sub set_counters { } }, { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'source' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'source' } ], + output_change_bytes => 2, output_template => 'Traffic In : %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'source_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'source' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'source' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'source' } ], + output_change_bytes => 2, output_template => 'Traffic Out : %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'source_absolute' }, - ], + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'source' }, + ] } - }, + } ]; } @@ -88,13 +88,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-source:s" => { name => 'filter_source' }, - "warning-status:s" => { name => 'warning_status' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} !~ /Connecting|Connected/i || %{error} !~ /none/i' }, - }); - + $options{options}->add_options(arguments => { + 'filter-source:s' => { name => 'filter_source' }, + 'warning-status:s' => { name => 'warning_status' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /Connecting|Connected/i || %{error} !~ /none/i' }, + }); + return $self; } diff --git a/apps/video/zixi/restapi/mode/broadcasteroutputusage.pm b/apps/video/zixi/restapi/mode/broadcasteroutputusage.pm index 10d74f706..35fd76a5e 100644 --- a/apps/video/zixi/restapi/mode/broadcasteroutputusage.pm +++ b/apps/video/zixi/restapi/mode/broadcasteroutputusage.pm @@ -57,38 +57,38 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'name' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'name' } ], + output_change_bytes => 2, output_template => 'Traffic In : %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name_absolute' }, - ], + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name' } + ] } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'name' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'name' } ], + output_change_bytes => 2, output_template => 'Traffic Out : %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name_absolute' }, - ], + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name' } + ] } }, { label => 'dropped-in', set => { key_values => [ { name => 'dropped_in', diff => 1 }, { name => 'name' } ], output_template => 'Packets Dropped In : %s', perfdatas => [ - { label => 'dropped_in', value => 'dropped_in_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, - ], + { label => 'dropped_in', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'name' } + ] } - }, + } ]; } @@ -97,13 +97,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} !~ /Connecting|Connected/i || %{error} !~ /none/i' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /Connecting|Connected/i || %{error} !~ /none/i' }, + }); + return $self; } diff --git a/apps/video/zixi/restapi/mode/broadcastersystemusage.pm b/apps/video/zixi/restapi/mode/broadcastersystemusage.pm index d02ebc931..31fcecfb8 100644 --- a/apps/video/zixi/restapi/mode/broadcastersystemusage.pm +++ b/apps/video/zixi/restapi/mode/broadcastersystemusage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu_load' } ], output_template => 'Cpu Load : %.2f %%', perfdatas => [ - { label => 'cpu_load', value => 'cpu_load_absolute', template => '%.2f', + { label => 'cpu_load', value => 'cpu_load', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'memory_used' } ], output_template => 'Memory Used : %.2f %%', perfdatas => [ - { label => 'memory_used', value => 'memory_used_absolute', template => '%.2f', + { label => 'memory_used', value => 'memory_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'disk_used' } ], output_template => 'Disk Used : %.2f %%', perfdatas => [ - { label => 'disk_used', value => 'disk_used_absolute', template => '%.2f', + { label => 'disk_used', value => 'disk_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/apps/video/zixi/restapi/mode/feederinputusage.pm b/apps/video/zixi/restapi/mode/feederinputusage.pm index 9fb0441e5..4ca0fa7d9 100644 --- a/apps/video/zixi/restapi/mode/feederinputusage.pm +++ b/apps/video/zixi/restapi/mode/feederinputusage.pm @@ -57,19 +57,19 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => $self->can('custom_status_threshold'), + closure_custom_threshold_check => $self->can('custom_status_threshold') } }, - { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'name' } ], - per_second => 1, output_change_bytes => 2, + { label => 'traffic-in', set => { + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'name' } ], + output_change_bytes => 2, output_template => 'Traffic In : %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name_absolute' }, - ], + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name' } + ] } - }, + } ]; } @@ -78,13 +78,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status' }, - "critical-status:s" => { name => 'critical_status' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status' }, + 'critical-status:s' => { name => 'critical_status' } + }); + return $self; } diff --git a/apps/video/zixi/restapi/mode/feederoutputusage.pm b/apps/video/zixi/restapi/mode/feederoutputusage.pm index 846b3ea83..239cff2b8 100644 --- a/apps/video/zixi/restapi/mode/feederoutputusage.pm +++ b/apps/video/zixi/restapi/mode/feederoutputusage.pm @@ -66,8 +66,8 @@ sub set_counters { output_change_bytes => 2, output_template => 'Current Bitrate : %s %s/s', perfdatas => [ - { label => 'current_bitrate', value => 'bitrate_absolute', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'current_bitrate', value => 'bitrate', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/apps/virtualization/ovirt/mode/cpuhost.pm b/apps/virtualization/ovirt/mode/cpuhost.pm index 29a2cbddd..8bdc2b6fa 100644 --- a/apps/virtualization/ovirt/mode/cpuhost.pm +++ b/apps/virtualization/ovirt/mode/cpuhost.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'user' }, { name => 'display' } ], output_template => 'user: %.2f %%', perfdatas => [ - { value => 'user_absolute', template => '%.2f', unit => '%', - min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'user', template => '%.2f', unit => '%', + min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'system' }, { name => 'display' } ], output_template => 'system: %.2f %%', perfdatas => [ - { value => 'system_absolute', template => '%.2f', unit => '%', - min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'system', template => '%.2f', unit => '%', + min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/vmware/connector/mode/alarmdatacenter.pm b/apps/vmware/connector/mode/alarmdatacenter.pm index 2201ad77d..5dc2b828c 100644 --- a/apps/vmware/connector/mode/alarmdatacenter.pm +++ b/apps/vmware/connector/mode/alarmdatacenter.pm @@ -128,7 +128,7 @@ sub set_counters { key_values => [ { name => 'yellow' } ], output_template => '%s warning alarm(s) found(s)', perfdatas => [ - { label => 'total_alarm_warning', value => 'yellow_absolute', template => '%s', min => 0 }, + { label => 'total_alarm_warning', value => 'yellow', template => '%s', min => 0 }, ], } }, @@ -136,7 +136,7 @@ sub set_counters { key_values => [ { name => 'red' } ], output_template => '%s critical alarm(s) found(s)', perfdatas => [ - { label => 'total_alarm_critical', value => 'red_absolute', template => '%s', min => 0 }, + { label => 'total_alarm_critical', value => 'red', template => '%s', min => 0 }, ], } }, diff --git a/apps/vmware/connector/mode/alarmhost.pm b/apps/vmware/connector/mode/alarmhost.pm index deaf33907..708524b5e 100644 --- a/apps/vmware/connector/mode/alarmhost.pm +++ b/apps/vmware/connector/mode/alarmhost.pm @@ -127,7 +127,7 @@ sub set_counters { key_values => [ { name => 'yellow' } ], output_template => '%s warning alarm(s) found(s)', perfdatas => [ - { label => 'total_alarm_warning', value => 'yellow_absolute', template => '%s', min => 0 }, + { label => 'total_alarm_warning', value => 'yellow', template => '%s', min => 0 }, ], } }, @@ -135,7 +135,7 @@ sub set_counters { key_values => [ { name => 'red' } ], output_template => '%s critical alarm(s) found(s)', perfdatas => [ - { label => 'total_alarm_critical', value => 'red_absolute', template => '%s', min => 0 }, + { label => 'total_alarm_critical', value => 'red', template => '%s', min => 0 }, ], } }, diff --git a/apps/vmware/connector/mode/countvmhost.pm b/apps/vmware/connector/mode/countvmhost.pm index 9b2878e27..645042ed4 100644 --- a/apps/vmware/connector/mode/countvmhost.pm +++ b/apps/vmware/connector/mode/countvmhost.pm @@ -52,8 +52,8 @@ sub set_counters { key_values => [ { name => 'poweredon' }, { name => 'total' } ], output_template => '%s VM(s) poweredon', perfdatas => [ - { label => 'poweredon', value => 'poweredon_absolute', template => '%s', - min => 0, max => 'total_absolute' } + { label => 'poweredon', value => 'poweredon', template => '%s', + min => 0, max => 'total' } ] } }, @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => 'poweredoff' }, { name => 'total' } ], output_template => '%s VM(s) poweredoff', perfdatas => [ - { label => 'poweredoff', value => 'poweredoff_absolute', template => '%s', - min => 0, max => 'total_absolute' } + { label => 'poweredoff', value => 'poweredoff', template => '%s', + min => 0, max => 'total' } ] } }, @@ -70,8 +70,8 @@ sub set_counters { key_values => [ { name => 'suspended' }, { name => 'total' } ], output_template => '%s VM(s) suspended', perfdatas => [ - { label => 'suspended', value => 'suspended_absolute', template => '%s', - min => 0, max => 'total_absolute' } + { label => 'suspended', value => 'suspended', template => '%s', + min => 0, max => 'total' } ] } }, @@ -90,8 +90,8 @@ sub set_counters { key_values => [ { name => 'poweredon' }, { name => 'total' } ], output_template => '%s VM(s) poweredon', perfdatas => [ - { label => 'poweredon', value => 'poweredon_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 } + { label => 'poweredon', value => 'poweredon', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 } ] } }, @@ -99,8 +99,8 @@ sub set_counters { key_values => [ { name => 'poweredoff' }, { name => 'total' } ], output_template => '%s VM(s) poweredoff', perfdatas => [ - { label => 'poweredoff', value => 'poweredoff_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 } + { label => 'poweredoff', value => 'poweredoff', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 } ] } }, @@ -108,8 +108,8 @@ sub set_counters { key_values => [ { name => 'suspended' }, { name => 'total' } ], output_template => '%s VM(s) suspended', perfdatas => [ - { label => 'suspended', value => 'suspended_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 } + { label => 'suspended', value => 'suspended', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 } ] } } diff --git a/apps/vmware/connector/mode/cpuhost.pm b/apps/vmware/connector/mode/cpuhost.pm index adcc66c51..08f9efa19 100644 --- a/apps/vmware/connector/mode/cpuhost.pm +++ b/apps/vmware/connector/mode/cpuhost.pm @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'cpu_average' } ], output_template => '%s %%', perfdatas => [ - { label => 'cpu_total', value => 'cpu_average_absolute', template => '%s', unit => '%', + { label => 'cpu_total', value => 'cpu_average', template => '%s', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } @@ -78,8 +78,8 @@ sub set_counters { key_values => [ { name => 'cpu_average_mhz' }, { name => 'cpu_average_mhz_max' } ], output_template => '%s MHz', perfdatas => [ - { label => 'cpu_total_MHz', value => 'cpu_average_mhz_absolute', template => '%s', unit => 'MHz', - min => 0, max => 'cpu_average_mhz_max_absolute', label_extra_instance => 1 }, + { label => 'cpu_total_MHz', value => 'cpu_average_mhz', template => '%s', unit => 'MHz', + min => 0, max => 'cpu_average_mhz_max', label_extra_instance => 1 }, ], } }, @@ -90,7 +90,7 @@ sub set_counters { key_values => [ { name => 'cpu_usage' }, { name => 'display' } ], output_template => 'usage : %s', perfdatas => [ - { label => 'cpu', value => 'cpu_usage_absolute', template => '%s', unit => '%', + { label => 'cpu', value => 'cpu_usage', template => '%s', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/cpuvm.pm b/apps/vmware/connector/mode/cpuvm.pm index fdfb7ab6e..6c7712633 100644 --- a/apps/vmware/connector/mode/cpuvm.pm +++ b/apps/vmware/connector/mode/cpuvm.pm @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'cpu_average' } ], output_template => '%s %%', perfdatas => [ - { label => 'cpu_total', value => 'cpu_average_absolute', template => '%s', unit => '%', + { label => 'cpu_total', value => 'cpu_average', template => '%s', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'cpu_average_mhz' } ], output_template => '%s MHz', perfdatas => [ - { label => 'cpu_total_MHz', value => 'cpu_average_mhz_absolute', template => '%s', unit => 'MHz', + { label => 'cpu_total_MHz', value => 'cpu_average_mhz', template => '%s', unit => 'MHz', min => 0, label_extra_instance => 1 }, ], } @@ -88,7 +88,7 @@ sub set_counters { key_values => [ { name => 'cpu_ready' } ], output_template => 'ready %s %%', perfdatas => [ - { label => 'cpu_ready', value => 'cpu_ready_absolute', template => '%s', unit => '%', + { label => 'cpu_ready', value => 'cpu_ready', template => '%s', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } @@ -100,7 +100,7 @@ sub set_counters { key_values => [ { name => 'cpu_usage' }, { name => 'display' } ], output_template => 'usage : %s MHz', perfdatas => [ - { label => 'cpu', value => 'cpu_usage_absolute', template => '%s', unit => 'MHz', + { label => 'cpu', value => 'cpu_usage', template => '%s', unit => 'MHz', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/datastorecountvm.pm b/apps/vmware/connector/mode/datastorecountvm.pm index 0381b115a..72a95d4f3 100644 --- a/apps/vmware/connector/mode/datastorecountvm.pm +++ b/apps/vmware/connector/mode/datastorecountvm.pm @@ -54,8 +54,8 @@ sub set_counters { key_values => [ { name => 'poweredon' }, { name => 'total' } ], output_template => '%s VM(s) poweredon', perfdatas => [ - { label => 'poweredon', value => 'poweredon_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'poweredon', value => 'poweredon', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -63,8 +63,8 @@ sub set_counters { key_values => [ { name => 'poweredoff' }, { name => 'total' } ], output_template => '%s VM(s) poweredoff', perfdatas => [ - { label => 'poweredoff', value => 'poweredoff_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'poweredoff', value => 'poweredoff', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -72,8 +72,8 @@ sub set_counters { key_values => [ { name => 'suspended' }, { name => 'total' } ], output_template => '%s VM(s) suspended', perfdatas => [ - { label => 'suspended', value => 'suspended_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'suspended', value => 'suspended', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'poweredon' }, { name => 'total' } ], output_template => '%s VM(s) poweredon', perfdatas => [ - { label => 'poweredon', value => 'poweredon_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { label => 'poweredon', value => 'poweredon', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 }, ], } }, @@ -101,8 +101,8 @@ sub set_counters { key_values => [ { name => 'poweredoff' }, { name => 'total' } ], output_template => '%s VM(s) poweredoff', perfdatas => [ - { label => 'poweredoff', value => 'poweredoff_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { label => 'poweredoff', value => 'poweredoff', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 }, ], } }, @@ -110,8 +110,8 @@ sub set_counters { key_values => [ { name => 'suspended' }, { name => 'total' } ], output_template => '%s VM(s) suspended', perfdatas => [ - { label => 'suspended', value => 'suspended_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { label => 'suspended', value => 'suspended', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 }, ], } }, diff --git a/apps/vmware/connector/mode/datastorehost.pm b/apps/vmware/connector/mode/datastorehost.pm index 214cdc7fa..0e25fdd74 100644 --- a/apps/vmware/connector/mode/datastorehost.pm +++ b/apps/vmware/connector/mode/datastorehost.pm @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'read_latency' }, { name => 'display' } ], output_template => 'read : %s ms', perfdatas => [ - { label => 'trl', value => 'read_latency_absolute', template => '%s', unit => 'ms', + { label => 'trl', value => 'read_latency', template => '%s', unit => 'ms', min => 0, label_extra_instance => 1 }, ], } @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'write_latency' }, { name => 'display' } ], output_template => 'write : %s ms', perfdatas => [ - { label => 'twl', value => 'write_latency_absolute', template => '%s', unit => 'ms', + { label => 'twl', value => 'write_latency', template => '%s', unit => 'ms', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/datastoreio.pm b/apps/vmware/connector/mode/datastoreio.pm index edeb13e31..b8db9e28a 100644 --- a/apps/vmware/connector/mode/datastoreio.pm +++ b/apps/vmware/connector/mode/datastoreio.pm @@ -54,7 +54,7 @@ sub set_counters { output_template => 'Total rate of reading data: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'total_read_rate', value => 'read_absolute', template => '%s', + { label => 'total_read_rate', value => 'read', template => '%s', unit => 'B/s', min => 0 }, ], } @@ -64,7 +64,7 @@ sub set_counters { output_template => 'Total rate of writing data: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'total_write_rate', value => 'write_absolute', template => '%s', + { label => 'total_write_rate', value => 'write', template => '%s', unit => 'B/s', min => 0 }, ], } @@ -85,7 +85,7 @@ sub set_counters { output_template => 'rate of reading data: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'read_rate', value => 'read_absolute', template => '%s', + { label => 'read_rate', value => 'read', template => '%s', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } @@ -95,7 +95,7 @@ sub set_counters { output_template => 'rate of writing data: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'write_rate', value => 'write_absolute', template => '%s', + { label => 'write_rate', value => 'write', template => '%s', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/datastoreiops.pm b/apps/vmware/connector/mode/datastoreiops.pm index 1a0b2c3b7..776cfae85 100644 --- a/apps/vmware/connector/mode/datastoreiops.pm +++ b/apps/vmware/connector/mode/datastoreiops.pm @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'read' } ], output_template => '%s read iops', perfdatas => [ - { label => 'riops', value => 'read_absolute', template => '%s', unit => 'iops', + { label => 'riops', value => 'read', template => '%s', unit => 'iops', min => 0, label_extra_instance => 1 }, ], } @@ -79,8 +79,8 @@ sub set_counters { key_values => [ { name => 'write' } ], output_template => '%s write iops', perfdatas => [ - { label => 'wiops', value => 'write_absolute', template => '%s', unit => 'iops', - min => 0, max => 'write_absolute', label_extra_instance => 1 }, + { label => 'wiops', value => 'write', template => '%s', unit => 'iops', + min => 0, max => 'write', label_extra_instance => 1 }, ], } }, @@ -91,7 +91,7 @@ sub set_counters { key_values => [ { name => 'read' } ], output_template => '%s read iops', perfdatas => [ - { label => 'vm_riops', value => 'read_absolute', template => '%s', unit => 'iops', + { label => 'vm_riops', value => 'read', template => '%s', unit => 'iops', min => 0, label_extra_instance => 1 }, ], } @@ -100,8 +100,8 @@ sub set_counters { key_values => [ { name => 'write' } ], output_template => '%s write iops', perfdatas => [ - { label => 'vm_wiops', value => 'write_absolute', template => '%s', unit => 'iops', - min => 0, max => 'write_absolute', label_extra_instance => 1 }, + { label => 'vm_wiops', value => 'write', template => '%s', unit => 'iops', + min => 0, max => 'write', label_extra_instance => 1 }, ], } }, diff --git a/apps/vmware/connector/mode/datastoresnapshot.pm b/apps/vmware/connector/mode/datastoresnapshot.pm index 0f1e38b02..0055afb9f 100644 --- a/apps/vmware/connector/mode/datastoresnapshot.pm +++ b/apps/vmware/connector/mode/datastoresnapshot.pm @@ -71,7 +71,7 @@ sub set_counters { output_template => 'total snapshots [size = %s %s]', output_change_bytes => 1, perfdatas => [ - { label => 'total_size', value => 'total_absolute', template => '%s', unit => 'B', + { label => 'total_size', value => 'total', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/datastoreusage.pm b/apps/vmware/connector/mode/datastoreusage.pm index a5edae08b..d60959c89 100644 --- a/apps/vmware/connector/mode/datastoreusage.pm +++ b/apps/vmware/connector/mode/datastoreusage.pm @@ -43,14 +43,14 @@ sub custom_status_calc { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space}); my $msg = sprintf( 'Usage Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space} ); return $msg; } @@ -104,8 +104,8 @@ sub set_counters { key_values => [ { name => 'used_space' }, { name => 'free_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'used', value => 'used_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -113,8 +113,8 @@ sub set_counters { key_values => [ { name => 'free_space' }, { name => 'used_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'free', value => 'free_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'free', value => 'free_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -122,8 +122,8 @@ sub set_counters { key_values => [ { name => 'prct_used_space' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_space_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used_prct', value => 'prct_used_space', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/apps/vmware/connector/mode/datastorevm.pm b/apps/vmware/connector/mode/datastorevm.pm index 23657ea95..abcb4a60f 100644 --- a/apps/vmware/connector/mode/datastorevm.pm +++ b/apps/vmware/connector/mode/datastorevm.pm @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'total_latency' } ], output_template => 'max total latency is %s ms', perfdatas => [ - { label => 'max_total_latency', value => 'total_latency_absolute', template => '%s', unit => 'ms', + { label => 'max_total_latency', value => 'total_latency', template => '%s', unit => 'ms', min => 0, label_extra_instance => 1 }, ], } @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'read' } ], output_template => '%s read iops', perfdatas => [ - { label => 'riops', value => 'read_absolute', template => '%s', unit => 'iops', + { label => 'riops', value => 'read', template => '%s', unit => 'iops', min => 0, label_extra_instance => 1 }, ], } @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'write' } ], output_template => '%s write iops', perfdatas => [ - { label => 'wiops', value => 'write_absolute', template => '%s', unit => 'iops', - min => 0, max => 'write_absolute', label_extra_instance => 1 }, + { label => 'wiops', value => 'write', template => '%s', unit => 'iops', + min => 0, max => 'write', label_extra_instance => 1 }, ], } }, diff --git a/apps/vmware/connector/mode/devicevm.pm b/apps/vmware/connector/mode/devicevm.pm index ea95a4f24..f8ba791eb 100644 --- a/apps/vmware/connector/mode/devicevm.pm +++ b/apps/vmware/connector/mode/devicevm.pm @@ -44,7 +44,7 @@ sub custom_status_calc { sub custom_device_output { my ($self, %options) = @_; - my $msg = sprintf("%s %s device connected", $self->{result_values}->{device_connected_absolute}, $self->{instance_mode}->{option_results}->{device}); + my $msg = sprintf("%s %s device connected", $self->{result_values}->{device_connected}, $self->{instance_mode}->{option_results}->{device}); return $msg; } @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'device_connected' } ], closure_custom_output => $self->can('custom_device_output'), perfdatas => [ - { label => 'total_device_connected', value => 'device_connected_absolute', template => '%s', + { label => 'total_device_connected', value => 'device_connected', template => '%s', min => 0 }, ], } @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'device_connected' }, { name => 'display' } ], oclosure_custom_output => $self->can('custom_device_output'), perfdatas => [ - { label => 'device_connected', value => 'device_connected_absolute', template => '%s', + { label => 'device_connected', value => 'device_connected', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/healthhost.pm b/apps/vmware/connector/mode/healthhost.pm index edb0848fa..ad7254413 100644 --- a/apps/vmware/connector/mode/healthhost.pm +++ b/apps/vmware/connector/mode/healthhost.pm @@ -44,10 +44,10 @@ sub custom_summary_output { my ($self, %options) = @_; my $msg; - if ($self->{result_values}->{type_absolute} ne '') { - $msg = $self->{result_values}->{type_absolute} . " sensor " . $self->{result_values}->{name_absolute} . ": ". $self->{result_values}->{summary_absolute}; + if ($self->{result_values}->{type} ne '') { + $msg = $self->{result_values}->{type} . " sensor " . $self->{result_values}->{name} . ": ". $self->{result_values}->{summary}; } else { - $msg = $self->{result_values}->{name_absolute} . ": ". $self->{result_values}->{summary_absolute}; + $msg = $self->{result_values}->{name} . ": ". $self->{result_values}->{summary}; } return $msg; } @@ -71,8 +71,8 @@ sub set_counters { key_values => [ { name => 'total_problems' }, { name => 'total' } ], output_template => '%s total health issue(s) found', perfdatas => [ - { label => 'total_problems', value => 'total_problems_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_problems', value => 'total_problems', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -100,8 +100,8 @@ sub set_counters { key_values => [ { name => 'total_problems' }, { name => 'total' } ], output_template => '%s total health issue(s) found', perfdatas => [ - { label => 'problems', value => 'total_problems_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { label => 'problems', value => 'total_problems', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 }, ], } }, @@ -109,8 +109,8 @@ sub set_counters { key_values => [ { name => 'yellow' }, { name => 'total' } ], output_template => '%s yellow health issue(s) found', perfdatas => [ - { label => 'problems_yellow', value => 'yellow_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { label => 'problems_yellow', value => 'yellow', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 }, ], } }, @@ -118,8 +118,8 @@ sub set_counters { key_values => [ { name => 'red' }, { name => 'total' } ], output_template => '%s red health issue(s) found', perfdatas => [ - { label => 'problems_red', value => 'red_absolute', template => '%s', - min => 0, max => 'total_absolute', label_extra_instance => 1 }, + { label => 'problems_red', value => 'red', template => '%s', + min => 0, max => 'total', label_extra_instance => 1 }, ], } }, diff --git a/apps/vmware/connector/mode/memoryhost.pm b/apps/vmware/connector/mode/memoryhost.pm index 0915e35da..1ad760d86 100644 --- a/apps/vmware/connector/mode/memoryhost.pm +++ b/apps/vmware/connector/mode/memoryhost.pm @@ -116,7 +116,7 @@ sub custom_usage_calc { sub custom_overhead_output { my ($self, %options) = @_; - my ($overhead_value, $overhead_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{overhead_absolute}); + my ($overhead_value, $overhead_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{overhead}); my $msg = sprintf("Memory Overhead: %s", $overhead_value . " " . $overhead_unit); return $msg; @@ -125,7 +125,7 @@ sub custom_overhead_output { sub custom_memstate_output { my ($self, %options) = @_; - my $msg = 'Memory state is ' . $self->{result_values}->{mem_state_str_absolute}; + my $msg = 'Memory state is ' . $self->{result_values}->{mem_state_str}; return $msg; } @@ -157,7 +157,7 @@ sub set_counters { key_values => [ { name => 'overhead' }, { name => 'display' } ], closure_custom_output => $self->can('custom_overhead_output'), perfdatas => [ - { label => 'overhead', value => 'overhead_absolute', template => '%s', unit => 'B', + { label => 'overhead', value => 'overhead', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 }, ], } @@ -166,7 +166,7 @@ sub set_counters { key_values => [ { name => 'mem_state' }, { name => 'mem_state_str' }, { name => 'display' } ], closure_custom_output => $self->can('custom_memstate_output'), perfdatas => [ - { label => 'state', value => 'mem_state_absolute', template => '%s', + { label => 'state', value => 'mem_state', template => '%s', min => 0, max => 3, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/memoryvm.pm b/apps/vmware/connector/mode/memoryvm.pm index 617b1736a..3d337967c 100644 --- a/apps/vmware/connector/mode/memoryvm.pm +++ b/apps/vmware/connector/mode/memoryvm.pm @@ -120,21 +120,21 @@ sub custom_usage_calc { sub custom_overhead_output { my ($self, %options) = @_; - my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{overhead_absolute}); + my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{overhead}); return sprintf('Memory overhead: %s %s', $value, $unit); } sub custom_ballooning_output { my ($self, %options) = @_; - my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{vmmemctl_absolute}); + my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{vmmemctl}); return sprintf('Memory ballooning: %s %s', $value, $unit); } sub custom_shared_output { my ($self, %options) = @_; - my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{shared_absolute}); + my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{shared}); return sprintf('Memory shared: %s %s', $value, $unit); } @@ -190,7 +190,7 @@ sub set_counters { key_values => [ { name => 'overhead' } ], closure_custom_output => $self->can('custom_overhead_output'), perfdatas => [ - { label => 'overhead', value => 'overhead_absolute', template => '%s', unit => 'B', + { label => 'overhead', value => 'overhead', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 } ] } @@ -201,7 +201,7 @@ sub set_counters { key_values => [ { name => 'vmmemctl' } ], closure_custom_output => $self->can('custom_ballooning_output'), perfdatas => [ - { label => 'ballooning', value => 'vmmemctl_absolute', template => '%s', unit => 'B', + { label => 'ballooning', value => 'vmmemctl', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 } ] } @@ -212,7 +212,7 @@ sub set_counters { key_values => [ { name => 'shared' } ], closure_custom_output => $self->can('custom_shared_output'), perfdatas => [ - { label => 'shared', value => 'shared_absolute', template => '%s', unit => 'B', + { label => 'shared', value => 'shared', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 } ] } diff --git a/apps/vmware/connector/mode/nethost.pm b/apps/vmware/connector/mode/nethost.pm index dc2da0c98..8569339ed 100644 --- a/apps/vmware/connector/mode/nethost.pm +++ b/apps/vmware/connector/mode/nethost.pm @@ -132,7 +132,7 @@ sub set_counters { output_template => 'host traffic in : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'host_traffic_in', value => 'traffic_in_absolute', template => '%s', + { label => 'host_traffic_in', value => 'traffic_in', template => '%s', unit => 'b/s', min => 0, label_extra_instance => 1 } ] } @@ -142,7 +142,7 @@ sub set_counters { output_template => 'host traffic out : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'host_traffic_out', value => 'traffic_out_absolute', template => '%s', + { label => 'host_traffic_out', value => 'traffic_out', template => '%s', unit => 'b/s', min => 0, label_extra_instance => 1 } ] } @@ -155,7 +155,7 @@ sub set_counters { output_template => 'traffic in : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'vswitch_traffic_in', value => 'traffic_in_absolute', template => '%s', + { label => 'vswitch_traffic_in', value => 'traffic_in', template => '%s', unit => 'b/s', min => 0, label_extra_instance => 1 }, ], } @@ -165,7 +165,7 @@ sub set_counters { output_template => 'traffic out : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'vswitch_traffic_out', value => 'traffic_out_absolute', template => '%s', + { label => 'vswitch_traffic_out', value => 'traffic_out', template => '%s', unit => 'b/s', min => 0, label_extra_instance => 1 } ] } diff --git a/apps/vmware/connector/mode/statconnectors.pm b/apps/vmware/connector/mode/statconnectors.pm index eeb322085..efd1f3b30 100644 --- a/apps/vmware/connector/mode/statconnectors.pm +++ b/apps/vmware/connector/mode/statconnectors.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'requests', diff => 1 } ], output_template => 'Total %s requests', perfdatas => [ - { label => 'requests', value => 'requests_absolute', template => '%s', + { label => 'requests', value => 'requests', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'requests', diff => 1 } ], output_template => '%s requests', perfdatas => [ - { label => 'requests', value => 'requests_absolute', template => '%s', + { label => 'requests', value => 'requests', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/swaphost.pm b/apps/vmware/connector/mode/swaphost.pm index aab266d6c..21b540c25 100644 --- a/apps/vmware/connector/mode/swaphost.pm +++ b/apps/vmware/connector/mode/swaphost.pm @@ -61,7 +61,7 @@ sub set_counters { output_template => 'Swap In: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'swap_in', value => 'swap_in_absolute', template => '%s', + { label => 'swap_in', value => 'swap_in', template => '%s', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } @@ -71,7 +71,7 @@ sub set_counters { output_template => 'Swap Out: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'swap_out', value => 'swap_out_absolute', template => '%s', + { label => 'swap_out', value => 'swap_out', template => '%s', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/swapvm.pm b/apps/vmware/connector/mode/swapvm.pm index f6ab8e229..84b007cf8 100644 --- a/apps/vmware/connector/mode/swapvm.pm +++ b/apps/vmware/connector/mode/swapvm.pm @@ -62,7 +62,7 @@ sub set_counters { output_template => 'Swap In: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'swap_in', value => 'swap_in_absolute', template => '%s', + { label => 'swap_in', value => 'swap_in', template => '%s', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } @@ -72,7 +72,7 @@ sub set_counters { output_template => 'Swap Out: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'swap_out', value => 'swap_out_absolute', template => '%s', + { label => 'swap_out', value => 'swap_out', template => '%s', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/timehost.pm b/apps/vmware/connector/mode/timehost.pm index e30153b8c..1fa2d2de9 100644 --- a/apps/vmware/connector/mode/timehost.pm +++ b/apps/vmware/connector/mode/timehost.pm @@ -45,7 +45,7 @@ sub custom_time_output { my ($self, %options) = @_; my $msg = sprintf("time offset %d second(s) : %s", - $self->{result_values}->{offset_absolute}, $self->{result_values}->{date_absolute}); + $self->{result_values}->{offset}, $self->{result_values}->{date}); return $msg; } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'offset' }, { name => 'date' }, { name => 'display' } ], closure_custom_output => $self->can('custom_time_output'), perfdatas => [ - { label => 'offset', value => 'offset_absolute', template => '%.2f', + { label => 'offset', value => 'offset', template => '%.2f', unit => 's', label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/uptimehost.pm b/apps/vmware/connector/mode/uptimehost.pm index dee66f450..e36edebee 100644 --- a/apps/vmware/connector/mode/uptimehost.pm +++ b/apps/vmware/connector/mode/uptimehost.pm @@ -45,7 +45,7 @@ sub custom_time_output { my ($self, %options) = @_; my $msg = sprintf("Uptime: %s day(s)", - int($self->{result_values}->{offset_absolute} / 60 / 60 / 24)); + int($self->{result_values}->{offset} / 60 / 60 / 24)); return $msg; } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'offset' }, { name => 'date' }, { name => 'display' } ], closure_custom_output => $self->can('custom_time_output'), perfdatas => [ - { label => 'uptime', value => 'offset_absolute', template => '%.2f', + { label => 'uptime', value => 'offset', template => '%.2f', unit => 's', label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/vmoperationcluster.pm b/apps/vmware/connector/mode/vmoperationcluster.pm index f8f4a5b4b..e0a95b6ad 100644 --- a/apps/vmware/connector/mode/vmoperationcluster.pm +++ b/apps/vmware/connector/mode/vmoperationcluster.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'numSVMotion', diff => 1 }, { name => 'display' } ], output_template => 'SVMotion %s', perfdatas => [ - { label => 'svmotion', value => 'numSVMotion_absolute', template => '%s', + { label => 'svmotion', value => 'numSVMotion', template => '%s', label_extra_instance => 1 }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'numVMotion', diff => 1 }, { name => 'display' } ], output_template => 'VMotion %s', perfdatas => [ - { label => 'vmotion', value => 'numVMotion_absolute', template => '%s', + { label => 'vmotion', value => 'numVMotion', template => '%s', label_extra_instance => 1 }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'numClone', diff => 1 }, { name => 'display' } ], output_template => 'Clone %s', perfdatas => [ - { label => 'clone', value => 'numClone_absolute', template => '%s', + { label => 'clone', value => 'numClone', template => '%s', label_extra_instance => 1 }, ], } diff --git a/apps/vmware/connector/mode/vsanclusterusage.pm b/apps/vmware/connector/mode/vsanclusterusage.pm index a2459810a..3783afd81 100644 --- a/apps/vmware/connector/mode/vsanclusterusage.pm +++ b/apps/vmware/connector/mode/vsanclusterusage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'iopsRead' } ], output_template => 'read IOPS: %s', perfdatas => [ - { value => 'iopsRead_absolute', template => '%s', unit => 'iops', min => 0 }, + { value => 'iopsRead', template => '%s', unit => 'iops', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'iopsWrite' } ], output_template => 'write IOPS: %s', perfdatas => [ - { value => 'iopsWrite_absolute', template => '%s', unit => 'iops', min => 0 }, + { value => 'iopsWrite', template => '%s', unit => 'iops', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'congestion' } ], output_template => 'congestions: %s', perfdatas => [ - { value => 'congestion_absolute', template => '%s', min => 0 }, + { value => 'congestion', template => '%s', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'oio' } ], output_template => 'outstanding IO: %s', perfdatas => [ - { value => 'oio_absolute', template => '%s', min => 0 }, + { value => 'oio', template => '%s', min => 0 }, ], } }, @@ -70,7 +70,7 @@ sub set_counters { output_template => 'read throughput: %s %s/s', output_change_bytes => 1, perfdatas => [ - { value => 'throughputRead_absolute', template => '%s', unit => 'B/s', min => 0 }, + { value => 'throughputRead', template => '%s', unit => 'B/s', min => 0 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { output_template => 'write throughput: %s %s/s', output_change_bytes => 1, perfdatas => [ - { value => 'throughputWrite_absolute', template => '%s', unit => 'B/s', min => 0 }, + { value => 'throughputWrite', template => '%s', unit => 'B/s', min => 0 }, ], } }, @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'latencyAvgRead' } ], output_template => 'read latency: %s ms', perfdatas => [ - { value => 'latencyAvgRead_absolute', template => '%s', unit => 'ms', min => 0 }, + { value => 'latencyAvgRead', template => '%s', unit => 'ms', min => 0 }, ], } }, @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'latencyAvgWrite' } ], output_template => 'write latency: %s ms', perfdatas => [ - { value => 'latencyAvgWrite_absolute', template => '%s', unit => 'ms', min => 0 }, + { value => 'latencyAvgWrite', template => '%s', unit => 'ms', min => 0 }, ], } }, diff --git a/apps/voip/3cx/restapi/mode/system.pm b/apps/voip/3cx/restapi/mode/system.pm index 72c82d761..6f784e7d7 100644 --- a/apps/voip/3cx/restapi/mode/system.pm +++ b/apps/voip/3cx/restapi/mode/system.pm @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'calls_active' } ], output_template => 'calls active : %s', perfdatas => [ - { label => 'calls_active', template => '%s', value => 'calls_active_absolute', + { label => 'calls_active', template => '%s', value => 'calls_active', min => 0 }, ], } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'extensions_registered' } ], output_template => 'extensions registered : %s', perfdatas => [ - { label => 'extensions_registered', template => '%s', value => 'extensions_registered_absolute', + { label => 'extensions_registered', template => '%s', value => 'extensions_registered', min => 0 }, ], } diff --git a/apps/voip/asterisk/ami/mode/channelusage.pm b/apps/voip/asterisk/ami/mode/channelusage.pm index de3341bd2..019fcad10 100644 --- a/apps/voip/asterisk/ami/mode/channelusage.pm +++ b/apps/voip/asterisk/ami/mode/channelusage.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'channels_active' } ], output_template => 'Channels Active: %s', perfdatas => [ - { label => 'channels_active', value => 'channels_active_absolute', template => '%s', min => 0 }, + { label => 'channels_active', value => 'channels_active', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'calls_active' } ], output_template => 'Calls Active: %s', perfdatas => [ - { label => 'calls_active', value => 'calls_active_absolute', template => '%s', min => 0 }, + { label => 'calls_active', value => 'calls_active', template => '%s', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'extcalls_active' } ], output_template => 'External Calls Active: %s', perfdatas => [ - { label => 'extcalls_active', value => 'extcalls_active_absolute', template => '%s', min => 0 }, + { label => 'extcalls_active', value => 'extcalls_active', template => '%s', min => 0 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'calls_count', diff => 1 } ], output_template => 'Calls Count: %s', perfdatas => [ - { label => 'calls_count', value => 'calls_count_absolute', template => '%s', min => 0 }, + { label => 'calls_count', value => 'calls_count', template => '%s', min => 0 }, ], } }, diff --git a/apps/voip/asterisk/ami/mode/sippeersusage.pm b/apps/voip/asterisk/ami/mode/sippeersusage.pm index bd2cc7120..63cdd3bd8 100644 --- a/apps/voip/asterisk/ami/mode/sippeersusage.pm +++ b/apps/voip/asterisk/ami/mode/sippeersusage.pm @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'total_peers' } ], output_template => 'Total Peers: %s', perfdatas => [ - { label => 'total_peers', value => 'total_peers_absolute', template => '%s', min => 0 }, + { label => 'total_peers', value => 'total_peers', template => '%s', min => 0 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'monitor_online_peers' } ], output_template => 'Monitor Online Peers: %s', perfdatas => [ - { label => 'monitor_online_peers', value => 'monitor_online_peers_absolute', template => '%s', min => 0 }, + { label => 'monitor_online_peers', value => 'monitor_online_peers', template => '%s', min => 0 }, ], } }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'monitor_offline_peers' } ], output_template => 'Monitor Offline Peers: %s', perfdatas => [ - { label => 'monitor_offline_peers', value => 'monitor_offline_peers_absolute', template => '%s', min => 0 }, + { label => 'monitor_offline_peers', value => 'monitor_offline_peers', template => '%s', min => 0 }, ], } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'unmonitor_online_peers' } ], output_template => 'Unmonitor Online Peers: %s', perfdatas => [ - { label => 'unmonitor_online_peers', value => 'unmonitor_online_peers_absolute', template => '%s', min => 0 }, + { label => 'unmonitor_online_peers', value => 'unmonitor_online_peers', template => '%s', min => 0 }, ], } }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'unmonitor_offline_peers' } ], output_template => 'Unmonitor Offline Peers: %s', perfdatas => [ - { label => 'unmonitor_offline_peers', value => 'unmonitor_offline_peers_absolute', template => '%s', min => 0 }, + { label => 'unmonitor_offline_peers', value => 'unmonitor_offline_peers', template => '%s', min => 0 }, ], } }, diff --git a/apps/voip/asterisk/snmp/mode/channelusage.pm b/apps/voip/asterisk/snmp/mode/channelusage.pm index 4f5743ba6..dd67d92e1 100644 --- a/apps/voip/asterisk/snmp/mode/channelusage.pm +++ b/apps/voip/asterisk/snmp/mode/channelusage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'channels_active' } ], output_template => 'Channels Active: %s', perfdatas => [ - { label => 'channels_active', value => 'channels_active_absolute', template => '%s', min => 0 }, + { label => 'channels_active', value => 'channels_active', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'calls_active' } ], output_template => 'Calls Active: %s', perfdatas => [ - { label => 'calls_active', value => 'calls_active_absolute', template => '%s', min => 0 }, + { label => 'calls_active', value => 'calls_active', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'calls_count', diff => 1 } ], output_template => 'Calls Count: %s', perfdatas => [ - { label => 'calls_count', value => 'calls_count_absolute', template => '%s', min => 0 }, + { label => 'calls_count', value => 'calls_count', template => '%s', min => 0 }, ], } }, diff --git a/apps/vtom/restapi/mode/jobstatus.pm b/apps/vtom/restapi/mode/jobstatus.pm index dc01b29d8..0a5658780 100644 --- a/apps/vtom/restapi/mode/jobstatus.pm +++ b/apps/vtom/restapi/mode/jobstatus.pm @@ -108,8 +108,8 @@ sub set_counters { key_values => [ { name => 'error' }, { name => 'total' } ], output_template => 'Error : %s', perfdatas => [ - { label => 'total_error', value => 'error_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_error', value => 'error', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -117,8 +117,8 @@ sub set_counters { key_values => [ { name => 'running' }, { name => 'total' } ], output_template => 'Running : %s', perfdatas => [ - { label => 'total_running', value => 'running_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_running', value => 'running', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -126,8 +126,8 @@ sub set_counters { key_values => [ { name => 'unplanned' }, { name => 'total' } ], output_template => 'Unplanned : %s', perfdatas => [ - { label => 'total_unplanned', value => 'unplanned_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_unplanned', value => 'unplanned', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -135,8 +135,8 @@ sub set_counters { key_values => [ { name => 'finished' }, { name => 'total' } ], output_template => 'Finished : %s', perfdatas => [ - { label => 'total_finished', value => 'finished_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_finished', value => 'finished', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -144,8 +144,8 @@ sub set_counters { key_values => [ { name => 'coming' }, { name => 'total' } ], output_template => 'Coming : %s', perfdatas => [ - { label => 'total_coming', value => 'coming_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_coming', value => 'coming', template => '%s', + min => 0, max => 'total' }, ], } }, diff --git a/apps/wazuh/restapi/mode/agents.pm b/apps/wazuh/restapi/mode/agents.pm index 26860ab51..f483e286b 100644 --- a/apps/wazuh/restapi/mode/agents.pm +++ b/apps/wazuh/restapi/mode/agents.pm @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => $_ } ], output_template => $_ . ': %s', perfdatas => [ - { value => $_ . '_absolute', template => '%s', min => 0 }, + { value => $_ , template => '%s', min => 0 }, ], } }; diff --git a/apps/wazuh/restapi/mode/manager.pm b/apps/wazuh/restapi/mode/manager.pm index 62c0fd97f..b2da0d896 100644 --- a/apps/wazuh/restapi/mode/manager.pm +++ b/apps/wazuh/restapi/mode/manager.pm @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => $_ } ], output_template => $_ . ': %s', perfdatas => [ - { value => $_ . '_absolute', template => '%s', min => 0 }, + { value => $_ , template => '%s', min => 0 }, ], } }; @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => $_, diff => 1 } ], output_template => $_ . ': %s', perfdatas => [ - { value => $_ . '_absolute', template => '%s', min => 0 }, + { value => $_ , template => '%s', min => 0 }, ], } }; diff --git a/apps/wsus/local/mode/computersstatus.pm b/apps/wsus/local/mode/computersstatus.pm index 52d88f9ad..a02edd2f2 100644 --- a/apps/wsus/local/mode/computersstatus.pm +++ b/apps/wsus/local/mode/computersstatus.pm @@ -40,7 +40,7 @@ sub set_counters { key_values => [ { name => 'ComputersUpToDateCount' } ], output_template => 'Up-to-date: %d', perfdatas => [ - { label => 'computers_up_to_date', value => 'ComputersUpToDateCount_absolute', + { label => 'computers_up_to_date', value => 'ComputersUpToDateCount', template => '%d', min => 0 }, ], } @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'ComputerTargetsNeedingUpdatesCount' } ], output_template => 'Needing Updates: %d', perfdatas => [ - { label => 'computers_needing_updates', value => 'ComputerTargetsNeedingUpdatesCount_absolute', + { label => 'computers_needing_updates', value => 'ComputerTargetsNeedingUpdatesCount', template => '%d', min => 0 }, ], } @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'ComputerTargetsWithUpdateErrorsCount' } ], output_template => 'With Update Errors: %d', perfdatas => [ - { label => 'computers_with_update_errors', value => 'ComputerTargetsWithUpdateErrorsCount_absolute', + { label => 'computers_with_update_errors', value => 'ComputerTargetsWithUpdateErrorsCount', template => '%d', min => 0 }, ], } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'ComputersNotContactedSinceCount' } ], output_template => 'Not Contacted: %d', perfdatas => [ - { label => 'computers_not_contacted', value => 'ComputersNotContactedSinceCount_absolute', + { label => 'computers_not_contacted', value => 'ComputersNotContactedSinceCount', template => '%d', min => 0 }, ], } @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'UnassignedComputersCount' } ], output_template => 'Unassigned: %s', perfdatas => [ - { label => 'computers_unassigned', value => 'UnassignedComputersCount_absolute', + { label => 'computers_unassigned', value => 'UnassignedComputersCount', template => '%d', min => 0 }, ], } diff --git a/apps/wsus/local/mode/serverstatistics.pm b/apps/wsus/local/mode/serverstatistics.pm index 927930f58..d0c604395 100644 --- a/apps/wsus/local/mode/serverstatistics.pm +++ b/apps/wsus/local/mode/serverstatistics.pm @@ -40,7 +40,7 @@ sub set_counters { key_values => [ { name => 'ComputerTargetCount' } ], output_template => 'Computers: %d', perfdatas => [ - { label => 'computers', value => 'ComputerTargetCount_absolute', + { label => 'computers', value => 'ComputerTargetCount', template => '%d', min => 0 }, ], } @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'CustomComputerTargetGroupCount' } ], output_template => 'Computer Groups: %d', perfdatas => [ - { label => 'computer_groups', value => 'CustomComputerTargetGroupCount_absolute', + { label => 'computer_groups', value => 'CustomComputerTargetGroupCount', template => '%d', min => 0 }, ], } @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'UpdateCount' } ], output_template => 'Updates: %d', perfdatas => [ - { label => 'updates', value => 'UpdateCount_absolute', + { label => 'updates', value => 'UpdateCount', template => '%d', min => 0 }, ], } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'ApprovedUpdateCount' } ], output_template => 'Approved Updates: %d', perfdatas => [ - { label => 'approved_updates', value => 'ApprovedUpdateCount_absolute', + { label => 'approved_updates', value => 'ApprovedUpdateCount', template => '%d', min => 0 }, ], } @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'DeclinedUpdateCount' } ], output_template => 'Declined Updates: %d', perfdatas => [ - { label => 'declined_updates', value => 'DeclinedUpdateCount_absolute', + { label => 'declined_updates', value => 'DeclinedUpdateCount', template => '%d', min => 0 }, ], } @@ -85,7 +85,7 @@ sub set_counters { key_values => [ { name => 'NotApprovedUpdateCount' } ], output_template => 'Not Approved Updates: %d', perfdatas => [ - { label => 'not_approved_updates', value => 'NotApprovedUpdateCount_absolute', + { label => 'not_approved_updates', value => 'NotApprovedUpdateCount', template => '%d', min => 0 }, ], } @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'UpdatesWithStaleUpdateApprovalsCount' } ], output_template => 'Stale Updates: %d', perfdatas => [ - { label => 'stale_updates', value => 'UpdatesWithStaleUpdateApprovalsCount_absolute', + { label => 'stale_updates', value => 'UpdatesWithStaleUpdateApprovalsCount', template => '%d', min => 0 }, ], } @@ -103,7 +103,7 @@ sub set_counters { key_values => [ { name => 'ExpiredUpdateCount' } ], output_template => 'Expired Updates: %d', perfdatas => [ - { label => 'expired_updates', value => 'ExpiredUpdateCount_absolute', + { label => 'expired_updates', value => 'ExpiredUpdateCount', template => '%d', min => 0 }, ], } diff --git a/apps/wsus/local/mode/updatesstatus.pm b/apps/wsus/local/mode/updatesstatus.pm index 390a16170..52ebb502f 100644 --- a/apps/wsus/local/mode/updatesstatus.pm +++ b/apps/wsus/local/mode/updatesstatus.pm @@ -40,7 +40,7 @@ sub set_counters { key_values => [ { name => 'UpdatesWithClientErrorsCount' } ], output_template => 'With Client Errors: %d', perfdatas => [ - { label => 'updates_with_client_errors', value => 'UpdatesWithClientErrorsCount_absolute', + { label => 'updates_with_client_errors', value => 'UpdatesWithClientErrorsCount', template => '%d', min => 0 }, ], } @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'UpdatesWithServerErrorsCount' } ], output_template => 'With Server Errors: %d', perfdatas => [ - { label => 'updates_with_server_errors', value => 'UpdatesWithServerErrorsCount_absolute', + { label => 'updates_with_server_errors', value => 'UpdatesWithServerErrorsCount', template => '%d', min => 0 }, ], } @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'UpdatesNeedingFilesCount' } ], output_template => 'Needing Files: %d', perfdatas => [ - { label => 'updates_needing_files_count', value => 'UpdatesNeedingFilesCount_absolute', + { label => 'updates_needing_files_count', value => 'UpdatesNeedingFilesCount', template => '%d', min => 0 }, ], } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'UpdatesNeededByComputersCount' } ], output_template => 'Needed By Computers: %d', perfdatas => [ - { label => 'updates_needed_by_computers', value => 'UpdatesNeededByComputersCount_absolute', + { label => 'updates_needed_by_computers', value => 'UpdatesNeededByComputersCount', template => '%d', min => 0 }, ], } @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'UpdatesUpToDateCount' } ], output_template => 'Up-to-date: %s', perfdatas => [ - { label => 'updates_up_to_date', value => 'UpdatesUpToDateCount_absolute', + { label => 'updates_up_to_date', value => 'UpdatesUpToDateCount', template => '%d', min => 0 }, ], } diff --git a/blockchain/hyperledger/exporter/mode/channels.pm b/blockchain/hyperledger/exporter/mode/channels.pm index c14c4678b..da153a85e 100644 --- a/blockchain/hyperledger/exporter/mode/channels.pm +++ b/blockchain/hyperledger/exporter/mode/channels.pm @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => $_->[2] . '_count', diff => 1 } ], output_template => '%s (total)', perfdatas => [ - { value => $_->[2] . '_count_absolute', template => '%s', min => 0, + { value => $_->[2] . '_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => $_->[2] . '_bucket_' . $label, diff => 1 } ], output_template => '%s (<= ' . $perf_label . ' sec)', perfdatas => [ - { value => $_->[2] . '_bucket_' . $label . '_absolute', template => '%s', min => 0, + { value => $_->[2] . '_bucket_' . $label , template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'ledger_transaction_count', diff => 1 } ], output_template => 'number of transactions processed: %s', perfdatas => [ - { value => 'ledger_transaction_count_absolute', template => '%s', min => 0, + { value => 'ledger_transaction_count', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -88,7 +88,7 @@ sub set_counters { key_values => [ { name => 'gossip_membership_total_peers_known' } ], output_template => 'total known peers: %s', perfdatas => [ - { value => 'gossip_membership_total_peers_known_absolute', template => '%s', min => 0, + { value => 'gossip_membership_total_peers_known', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => 'gossip_state_height' } ], output_template => 'current ledger height: %s', perfdatas => [ - { value => 'gossip_state_height_absolute', template => '%s', min => 0, + { value => 'gossip_state_height', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'ledger_blockchain_height' } ], output_template => 'height of the chain in blocks: %s', perfdatas => [ - { value => 'ledger_blockchain_height_absolute', template => '%s', min => 0, + { value => 'ledger_blockchain_height', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/centreon/common/airespace/snmp/mode/apchannelinterference.pm b/centreon/common/airespace/snmp/mode/apchannelinterference.pm index 76a3abe9a..5229a275a 100644 --- a/centreon/common/airespace/snmp/mode/apchannelinterference.pm +++ b/centreon/common/airespace/snmp/mode/apchannelinterference.pm @@ -36,8 +36,8 @@ sub set_counters { key_values => [ { name => 'interference_power' }, { name => 'label_perfdata' } ], output_template => 'Interference Power : %s', perfdatas => [ - { label => 'interference_power', value => 'interference_power_absolute', template => '%s', - label_extra_instance => 1, instance_use => 'label_perfdata_absolute' }, + { label => 'interference_power', value => 'interference_power', template => '%s', + label_extra_instance => 1, instance_use => 'label_perfdata' }, ], } }, @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => 'interference_util' }, { name => 'label_perfdata' } ], output_template => 'Interference Utilization : %s %%', perfdatas => [ - { label => 'interference_util', value => 'interference_util_absolute', template => '%s', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'label_perfdata_absolute' }, + { label => 'interference_util', value => 'interference_util', template => '%s', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'label_perfdata' }, ], } }, diff --git a/centreon/common/airespace/snmp/mode/apchannelnoise.pm b/centreon/common/airespace/snmp/mode/apchannelnoise.pm index 14b34299a..0f81c193d 100644 --- a/centreon/common/airespace/snmp/mode/apchannelnoise.pm +++ b/centreon/common/airespace/snmp/mode/apchannelnoise.pm @@ -36,8 +36,8 @@ sub set_counters { key_values => [ { name => 'noise_power' }, { name => 'label_perfdata' } ], output_template => 'Noise Power : %s dBm', perfdatas => [ - { label => 'noise_power', value => 'noise_power_absolute', template => '%s', - unit => 'dBm', label_extra_instance => 1, instance_use => 'label_perfdata_absolute' }, + { label => 'noise_power', value => 'noise_power', template => '%s', + unit => 'dBm', label_extra_instance => 1, instance_use => 'label_perfdata' }, ], } }, diff --git a/centreon/common/airespace/snmp/mode/apstatus.pm b/centreon/common/airespace/snmp/mode/apstatus.pm index fda788f52..a0b9bed86 100644 --- a/centreon/common/airespace/snmp/mode/apstatus.pm +++ b/centreon/common/airespace/snmp/mode/apstatus.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total ap : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'associated' } ], output_template => 'Total ap associated : %s', perfdatas => [ - { label => 'total_associated', value => 'associated_absolute', template => '%s', + { label => 'total_associated', value => 'associated', template => '%s', min => 0 }, ], } @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'disassociating' } ], output_template => 'Total ap disassociating : %s', perfdatas => [ - { label => 'total_disassociating', value => 'disassociating_absolute', template => '%s', + { label => 'total_disassociating', value => 'disassociating', template => '%s', min => 0 }, ], } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'enable' } ], output_template => 'Total ap enabled : %s', perfdatas => [ - { label => 'total_enabled', value => 'enable_absolute', template => '%s', + { label => 'total_enabled', value => 'enable', template => '%s', min => 0 }, ], } @@ -96,7 +96,7 @@ sub set_counters { key_values => [ { name => 'disable' } ], output_template => 'Total ap disabled : %s', perfdatas => [ - { label => 'total_disabled', value => 'disable_absolute', template => '%s', + { label => 'total_disabled', value => 'disable', template => '%s', min => 0 }, ], } diff --git a/centreon/common/airespace/snmp/mode/apusers.pm b/centreon/common/airespace/snmp/mode/apusers.pm index f16600743..58cf67188 100644 --- a/centreon/common/airespace/snmp/mode/apusers.pm +++ b/centreon/common/airespace/snmp/mode/apusers.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Users : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', unit => 'users', min => 0 }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'total_idle' } ], output_template => 'Total Idle Users : %s', perfdatas => [ - { label => 'total_idle', value => 'total_idle_absolute', template => '%s', + { label => 'total_idle', value => 'total_idle', template => '%s', unit => 'users', min => 0 }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'total_aaapending' } ], output_template => 'Total AaaPending Users : %s', perfdatas => [ - { label => 'total_aaapending', value => 'total_aaapending_absolute', template => '%s', + { label => 'total_aaapending', value => 'total_aaapending', template => '%s', unit => 'users', min => 0 }, ], } @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'total_authenticated' } ], output_template => 'Total Authenticated Users : %s', perfdatas => [ - { label => 'total_authenticated', value => 'total_authenticated_absolute', template => '%s', + { label => 'total_authenticated', value => 'total_authenticated', template => '%s', unit => 'users', min => 0 }, ], } @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'total_associated' } ], output_template => 'Total Associated Users : %s', perfdatas => [ - { label => 'total_associated', value => 'total_associated_absolute', template => '%s', + { label => 'total_associated', value => 'total_associated', template => '%s', unit => 'users', min => 0 }, ], } @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'total_powersave' } ], output_template => 'Total Powersave Users : %s', perfdatas => [ - { label => 'total_powersave', value => 'total_powersave_absolute', template => '%s', + { label => 'total_powersave', value => 'total_powersave', template => '%s', unit => 'users', min => 0 }, ], } @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => 'total_disassociated' } ], output_template => 'Total Disassociated Users : %s', perfdatas => [ - { label => 'total_disassociated', value => 'total_disassociated_absolute', template => '%s', + { label => 'total_disassociated', value => 'total_disassociated', template => '%s', unit => 'users', min => 0 }, ], } @@ -101,7 +101,7 @@ sub set_counters { key_values => [ { name => 'total_tobedeleted' } ], output_template => 'Total ToBeDeleted Users : %s', perfdatas => [ - { label => 'total_tobedeleted', value => 'total_tobedeleted_absolute', template => '%s', + { label => 'total_tobedeleted', value => 'total_tobedeleted', template => '%s', unit => 'users', min => 0 }, ], } @@ -110,7 +110,7 @@ sub set_counters { key_values => [ { name => 'total_probing' } ], output_template => 'Total Probing Users : %s', perfdatas => [ - { label => 'total_probing', value => 'total_probing_absolute', template => '%s', + { label => 'total_probing', value => 'total_probing', template => '%s', unit => 'users', min => 0 }, ], } @@ -119,7 +119,7 @@ sub set_counters { key_values => [ { name => 'total_blacklisted' } ], output_template => 'Total Blacklisted Users : %s', perfdatas => [ - { label => 'total_blacklisted', value => 'total_blacklisted_absolute', template => '%s', + { label => 'total_blacklisted', value => 'total_blacklisted', template => '%s', unit => 'users', min => 0 }, ], } @@ -131,8 +131,8 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'display' } ], output_template => 'users : %s', perfdatas => [ - { label => 'ssid', value => 'total_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ssid', value => 'total', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -143,8 +143,8 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'display' } ], output_template => 'users : %s', perfdatas => [ - { label => 'ap', value => 'total_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ap', value => 'total', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/aruba/snmp/mode/apconnections.pm b/centreon/common/aruba/snmp/mode/apconnections.pm index d8d540461..3e59a90b9 100644 --- a/centreon/common/aruba/snmp/mode/apconnections.pm +++ b/centreon/common/aruba/snmp/mode/apconnections.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total access points connected : %d', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%d', min => 0 }, + { label => 'total', value => 'total', template => '%d', min => 0 }, ], } }, @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => 'apTotalTime' }, { name => 'bssid' }, ], output_template => 'Current total connection time : %.3f s', perfdatas => [ - { label => 'total_time', value => 'apTotalTime_absolute', template => '%.3f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'bssid_absolute' }, + { label => 'total_time', value => 'apTotalTime', template => '%.3f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'bssid' }, ], } }, @@ -58,8 +58,8 @@ sub set_counters { key_values => [ { name => 'apInactiveTime' }, { name => 'bssid' }, ], output_template => 'Current inactive time : %.3f s', perfdatas => [ - { label => 'inactive_time', value => 'apInactiveTime_absolute', template => '%.3f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'bssid_absolute' }, + { label => 'inactive_time', value => 'apInactiveTime', template => '%.3f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'bssid' }, ], } }, @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'apChannelNoise' }, { name => 'bssid' }, ], output_template => 'Channel noise : %d', perfdatas => [ - { label => 'channel_noise', value => 'apChannelNoise_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'bssid_absolute' }, + { label => 'channel_noise', value => 'apChannelNoise', template => '%d', + label_extra_instance => 1, instance_use => 'bssid' }, ], } }, @@ -76,8 +76,8 @@ sub set_counters { key_values => [ { name => 'apSignalToNoiseRatio' }, { name => 'bssid' }, ], output_template => 'Signal to noise ratio : %d', perfdatas => [ - { label => 'snr', value => 'apSignalToNoiseRatio_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'bssid_absolute' }, + { label => 'snr', value => 'apSignalToNoiseRatio', template => '%d', + label_extra_instance => 1, instance_use => 'bssid' }, ], } }, diff --git a/centreon/common/aruba/snmp/mode/apssidstatistics.pm b/centreon/common/aruba/snmp/mode/apssidstatistics.pm index cc605fd66..f218e0d1e 100644 --- a/centreon/common/aruba/snmp/mode/apssidstatistics.pm +++ b/centreon/common/aruba/snmp/mode/apssidstatistics.pm @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Stations Associated: %d', perfdatas => [ - { value => 'total_absolute', template => '%d', min => 0 }, + { value => 'total', template => '%d', min => 0 }, ], } }, @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'wlanAPEssidNumAssociatedStations' }, { name => 'wlanAPESSID' } ], output_template => 'Associated Stations: %d', perfdatas => [ - { value => 'wlanAPEssidNumAssociatedStations_absolute', template => '%d', + { value => 'wlanAPEssidNumAssociatedStations', template => '%d', label_extra_instance => 1 }, ], } @@ -70,7 +70,7 @@ sub set_counters { { name => 'wlanAPESSID' } ], output_template => 'Associated Stations: %d', perfdatas => [ - { value => 'wlanAPBssidNumAssociatedStations_absolute', template => '%d', + { value => 'wlanAPBssidNumAssociatedStations', template => '%d', label_extra_instance => 1 }, ], } @@ -80,7 +80,7 @@ sub set_counters { { name => 'wlanAPESSID' } ], output_template => 'Channel Noise: %d', perfdatas => [ - { value => 'apChannelNoise_absolute', template => '%d', + { value => 'apChannelNoise', template => '%d', label_extra_instance => 1 }, ], } @@ -90,7 +90,7 @@ sub set_counters { { name => 'wlanAPESSID' } ], output_template => 'Signal To Noise Ratio: %d', perfdatas => [ - { value => 'apSignalToNoiseRatio_absolute', template => '%d', + { value => 'apSignalToNoiseRatio', template => '%d', label_extra_instance => 1 }, ], } diff --git a/centreon/common/aruba/snmp/mode/apstatus.pm b/centreon/common/aruba/snmp/mode/apstatus.pm index 932207977..d585e3893 100644 --- a/centreon/common/aruba/snmp/mode/apstatus.pm +++ b/centreon/common/aruba/snmp/mode/apstatus.pm @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'connected' } ], output_template => 'Total connected AP: %d', perfdatas => [ - { value => 'connected_absolute', template => '%d', min => 0 }, + { value => 'connected', template => '%d', min => 0 }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'wlanAPUpTime' }, { name => 'wlanAPName' } ], output_template => 'Uptime: %ss', perfdatas => [ - { value => 'wlanAPUpTime_absolute', template => '%s', - unit => 's', label_extra_instance => 1, instance_use => 'wlanAPName_absolute' }, + { value => 'wlanAPUpTime', template => '%s', + unit => 's', label_extra_instance => 1, instance_use => 'wlanAPName' }, ], } }, @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'wlanAPNumBootstraps' }, { name => 'wlanAPName' } ], output_template => 'Controller Bootstrap Count: %d', perfdatas => [ - { value => 'wlanAPNumBootstraps_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'wlanAPName_absolute' }, + { value => 'wlanAPNumBootstraps', template => '%d', + label_extra_instance => 1, instance_use => 'wlanAPName' }, ], } }, @@ -101,8 +101,8 @@ sub set_counters { key_values => [ { name => 'wlanAPNumReboots' }, { name => 'wlanAPName' } ], output_template => 'Reboot Count: %d', perfdatas => [ - { value => 'wlanAPNumReboots_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'wlanAPName_absolute' }, + { value => 'wlanAPNumReboots', template => '%d', + label_extra_instance => 1, instance_use => 'wlanAPName' }, ], } }, diff --git a/centreon/common/aruba/snmp/mode/apusers.pm b/centreon/common/aruba/snmp/mode/apusers.pm index d0f547554..5df8571ce 100644 --- a/centreon/common/aruba/snmp/mode/apusers.pm +++ b/centreon/common/aruba/snmp/mode/apusers.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Users : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', unit => 'users', min => 0 }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'total_none' } ], output_template => 'Total Auth None : %s', perfdatas => [ - { label => 'total_none', value => 'total_none_absolute', template => '%s', + { label => 'total_none', value => 'total_none', template => '%s', unit => 'users', min => 0 }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'total_other' } ], output_template => 'Total Auth Other : %s', perfdatas => [ - { label => 'total_other', value => 'total_other_absolute', template => '%s', + { label => 'total_other', value => 'total_other', template => '%s', unit => 'users', min => 0 }, ], } @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'total_web' } ], output_template => 'Total Auth Web : %s', perfdatas => [ - { label => 'total_web', value => 'total_web_absolute', template => '%s', + { label => 'total_web', value => 'total_web', template => '%s', unit => 'users', min => 0 }, ], } @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'total_dot1x' } ], output_template => 'Total Auth Dot1x : %s', perfdatas => [ - { label => 'total_dot1x', value => 'total_dot1x_absolute', template => '%s', + { label => 'total_dot1x', value => 'total_dot1x', template => '%s', unit => 'users', min => 0 }, ], } @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'total_vpn' } ], output_template => 'Total Auth Vpn : %s', perfdatas => [ - { label => 'total_vpn', value => 'total_vpn_absolute', template => '%s', + { label => 'total_vpn', value => 'total_vpn', template => '%s', unit => 'users', min => 0 }, ], } @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => 'total_mac' } ], output_template => 'Total Auth Mac : %s', perfdatas => [ - { label => 'total_mac', value => 'total_mac_absolute', template => '%s', + { label => 'total_mac', value => 'total_mac', template => '%s', unit => 'users', min => 0 }, ], } @@ -101,7 +101,7 @@ sub set_counters { key_values => [ { name => 'avg_connection_time' } ], output_template => 'Users average connection time : %.3f seconds', perfdatas => [ - { label => 'avg_connection_time', value => 'avg_connection_time_absolute', template => '%.3f', + { label => 'avg_connection_time', value => 'avg_connection_time', template => '%.3f', unit => 's', min => 0 }, ], } @@ -113,8 +113,8 @@ sub set_counters { key_values => [ { name => 'users' }, { name => 'essid' } ], output_template => 'users : %s', perfdatas => [ - { label => 'essid', value => 'users_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'essid_absolute' }, + { label => 'essid', value => 'users', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'essid' }, ], } }, @@ -125,8 +125,8 @@ sub set_counters { key_values => [ { name => 'users' }, { name => 'ap_id' } ], output_template => 'users : %s', perfdatas => [ - { label => 'ap', value => 'users_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'ap_id_absolute' }, + { label => 'ap', value => 'users', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'ap_id' }, ], } }, diff --git a/centreon/common/aruba/snmp/mode/controllerstatus.pm b/centreon/common/aruba/snmp/mode/controllerstatus.pm index 58032b9d6..08346a6c9 100644 --- a/centreon/common/aruba/snmp/mode/controllerstatus.pm +++ b/centreon/common/aruba/snmp/mode/controllerstatus.pm @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'Total controllers: %d', perfdatas => [ - { value => 'current_absolute', template => '%d', min => 0 }, + { value => 'current', template => '%d', min => 0 }, ], } }, diff --git a/centreon/common/aruba/snmp/mode/cpu.pm b/centreon/common/aruba/snmp/mode/cpu.pm index fc90abc14..4b8bec6f6 100644 --- a/centreon/common/aruba/snmp/mode/cpu.pm +++ b/centreon/common/aruba/snmp/mode/cpu.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'sysExtProcessorLoad' }, { name => 'sysExtProcessorDescr' } ], output_template => 'Utilization %.2f%%', perfdatas => [ - { label => 'utilization', value => 'sysExtProcessorLoad_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'sysExtProcessorDescr_absolute' }, + { label => 'utilization', value => 'sysExtProcessorLoad', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'sysExtProcessorDescr' }, ], } }, diff --git a/centreon/common/avaya/snmp/mode/cpu.pm b/centreon/common/avaya/snmp/mode/cpu.pm index 3652a7747..052a46e23 100644 --- a/centreon/common/avaya/snmp/mode/cpu.pm +++ b/centreon/common/avaya/snmp/mode/cpu.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'display' } ], output_template => 'usage : %s %%', perfdatas => [ - { label => 'cpu_usage', value => 'cpu_absolute', template => '%s', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_usage', value => 'cpu', template => '%s', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/broadcom/fastpath/snmp/mode/cpu.pm b/centreon/common/broadcom/fastpath/snmp/mode/cpu.pm index cfa18018d..871b6e876 100644 --- a/centreon/common/broadcom/fastpath/snmp/mode/cpu.pm +++ b/centreon/common/broadcom/fastpath/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'usage_5s' } ], output_template => '%.2f %% (5sec)', output_error_template => "%s (5sec)", perfdatas => [ - { label => 'cpu_5s', value => 'usage_5s_absolute', template => '%.2f', + { label => 'cpu_5s', value => 'usage_5s', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'usage_1m' } ], output_template => '%.2f %% (1m)', output_error_template => "%s (1min)", perfdatas => [ - { label => 'cpu_1m', value => 'usage_1m_absolute', template => '%.2f', + { label => 'cpu_1m', value => 'usage_1m', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'usage_5m' } ], output_template => '%.2f %% (5min)', output_error_template => "%s (5min)", perfdatas => [ - { label => 'cpu_5m', value => 'usage_5m_absolute', template => '%.2f', + { label => 'cpu_5m', value => 'usage_5m', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/centreon/common/cisco/ironport/snmp/mode/cpu.pm b/centreon/common/cisco/ironport/snmp/mode/cpu.pm index 014ec5145..48bc32396 100644 --- a/centreon/common/cisco/ironport/snmp/mode/cpu.pm +++ b/centreon/common/cisco/ironport/snmp/mode/cpu.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'perCentCPUUtilization' } ], output_template => 'cpu global usage is: %.2f%%', perfdatas => [ - { value => 'perCentCPUUtilization_absolute', template => '%.2f', + { value => 'perCentCPUUtilization', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'cacheCpuUsage' } ], output_template => 'cpu proxy usage is: %.2f%%', perfdatas => [ - { value => 'cacheCpuUsage_absolute', template => '%.2f', + { value => 'cacheCpuUsage', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/centreon/common/cisco/ironport/snmp/mode/mailusage.pm b/centreon/common/cisco/ironport/snmp/mode/mailusage.pm index 20e923c2a..4244bbe4a 100644 --- a/centreon/common/cisco/ironport/snmp/mode/mailusage.pm +++ b/centreon/common/cisco/ironport/snmp/mode/mailusage.pm @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'msgs_in_work_queue' } ], output_template => 'messages in work queue: %s', perfdatas => [ - { value => 'msgs_in_work_queue_absolute', template => '%s', min => 0 }, + { value => 'msgs_in_work_queue', template => '%s', min => 0 }, ], } }, @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'outstandingDNSRequests' } ], output_template => 'dns requests with no reply: %s', perfdatas => [ - { value => 'outstandingDNSRequests_absolute', template => '%s', min => 0 }, + { value => 'outstandingDNSRequests', template => '%s', min => 0 }, ], } }, @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'pendingDNSRequests' } ], output_template => 'dns requests pending: %s', perfdatas => [ - { value => 'pendingDNSRequests_absolute', template => '%s', min => 0 }, + { value => 'pendingDNSRequests', template => '%s', min => 0 }, ], } }, @@ -80,7 +80,7 @@ sub set_counters { key_values => [ { name => 'openFilesOrSockets' } ], output_template => 'fd opened: %s', perfdatas => [ - { value => 'openFilesOrSockets_absolute', template => '%s', min => 0 }, + { value => 'openFilesOrSockets', template => '%s', min => 0 }, ], } }, @@ -88,7 +88,7 @@ sub set_counters { key_values => [ { name => 'mailTransferThreads' } ], output_template => 'threads mail: %s', perfdatas => [ - { value => 'mailTransferThreads_absolute', template => '%s', min => 0 }, + { value => 'mailTransferThreads', template => '%s', min => 0 }, ], } }, @@ -99,8 +99,8 @@ sub set_counters { key_values => [ { name => 'updateFailures', diff => 1 }, { name => 'updateServiceName' } ], output_template => 'update failures: %s', perfdatas => [ - { value => 'updateFailures_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'updateServiceName_absolute' }, + { value => 'updateFailures', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'updateServiceName' }, ], } }, @@ -110,10 +110,10 @@ sub set_counters { { label => 'time-expiration', nlabel => 'key.time.expiration.seconds', set => { key_values => [ { name => 'seconds' }, { name => 'msg' }, { name => 'display' } ], output_template => '%s remaining before expiration', - output_use => 'msg_absolute', + output_use => 'msg', perfdatas => [ - { value => 'seconds_absolute', template => '%s', - unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'seconds', template => '%s', + unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/cisco/ironport/snmp/mode/proxyusage.pm b/centreon/common/cisco/ironport/snmp/mode/proxyusage.pm index 8a3c3b4fc..85b5b5b81 100644 --- a/centreon/common/cisco/ironport/snmp/mode/proxyusage.pm +++ b/centreon/common/cisco/ironport/snmp/mode/proxyusage.pm @@ -64,28 +64,25 @@ sub set_counters { key_values => [ { name => 'cacheClientErrors', diff => 1 } ], output_template => 'client errors: %s', perfdatas => [ - { value => 'cacheClientErrors_absolute', template => '%s', - min => 0 }, + { template => '%s', min => 0 }, ], } }, { label => 'client-http-traffic-in', display_ok => 0, nlabel => 'client.http.traffic.in.bitspersecond', set => { - key_values => [ { name => 'cacheClientInKb', diff => 1 } ], + key_values => [ { name => 'cacheClientInKb', per_second => 1 } ], output_template => 'client traffic in: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'cacheClientInKb_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'client-http-traffic-out', display_ok => 0, nlabel => 'client.http.traffic.out.bitspersecond', set => { - key_values => [ { name => 'cacheClientOutKb', diff => 1 } ], + key_values => [ { name => 'cacheClientOutKb', per_second => 1 } ], output_template => 'client traffic out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'cacheClientOutKb_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { template => '%s', min => 0, unit => 'b/s' }, ], } }, @@ -93,18 +90,15 @@ sub set_counters { key_values => [ { name => 'cacheClientTotalConns' } ], output_template => 'total number of clients: %s', perfdatas => [ - { value => 'cacheClientTotalConns_absolute', template => '%s', - min => 0 }, + { template => '%s', min => 0 }, ], } }, { label => 'client-http-requests', display_ok => 0, nlabel => 'client.http.requests.persecond', set => { - key_values => [ { name => 'cacheClientRequests', diff => 1 } ], + key_values => [ { name => 'cacheClientRequests', per_second => 1 } ], output_template => 'client requests: %.2f/s', - per_second => 1, perfdatas => [ - { value => 'cacheClientRequests_per_second', template => '%.2f', - min => 0, unit => '/s' }, + { template => '%.2f', min => 0, unit => '/s' }, ], } }, @@ -128,28 +122,25 @@ sub set_counters { key_values => [ { name => 'cacheMeanRespTime' } ], output_template => 'http mean response time: %s ms', perfdatas => [ - { value => 'cacheMeanRespTime_absolute', template => '%s', - min => 0, unit => 'ms' }, + { template => '%s', min => 0, unit => 'ms' }, ], } }, { label => 'server-traffic-in', display_ok => 0, nlabel => 'server.traffic.in.bitspersecond', set => { - key_values => [ { name => 'cacheServerInKb', diff => 1 } ], + key_values => [ { name => 'cacheServerInKb', per_second => 1 } ], output_template => 'server traffic in: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'cacheServerInKb_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'server-traffic-out', display_ok => 0, nlabel => 'server.traffic.out.bitspersecond', set => { - key_values => [ { name => 'cacheServerOutKb', diff => 1 } ], + key_values => [ { name => 'cacheServerOutKb', per_second => 1 } ], output_template => 'server traffic out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'cacheServerOutKb_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { template => '%s', min => 0, unit => 'b/s' }, ], } }, diff --git a/centreon/common/cisco/ironport/xmlapi/mode/systemusage.pm b/centreon/common/cisco/ironport/xmlapi/mode/systemusage.pm index cdf288484..645188db9 100644 --- a/centreon/common/cisco/ironport/xmlapi/mode/systemusage.pm +++ b/centreon/common/cisco/ironport/xmlapi/mode/systemusage.pm @@ -63,8 +63,7 @@ sub set_counters { key_values => [ { name => 'ram_utilization' } ], output_template => 'memory usage: %.2f %%', perfdatas => [ - { value => 'ram_utilization_absolute', template => '%.2f', - unit => '%', min => 0, max => 100 }, + { template => '%.2f', unit => '%', min => 0, max => 100 }, ], } }, @@ -72,8 +71,7 @@ sub set_counters { key_values => [ { name => 'total_utilization' } ], output_template => 'total cpu usage: %.2f %%', perfdatas => [ - { value => 'total_utilization_absolute', template => '%.2f', - unit => '%', min => 0, max => 100 }, + { template => '%.2f', unit => '%', min => 0, max => 100 }, ], } }, @@ -81,8 +79,7 @@ sub set_counters { key_values => [ { name => 'disk_utilization' } ], output_template => 'disk i/o usage: %.2f %%', perfdatas => [ - { value => 'disk_utilization_absolute', template => '%.2f', - unit => '%', min => 0, max => 100 }, + { template => '%.2f', unit => '%', min => 0, max => 100 }, ], } }, @@ -90,8 +87,7 @@ sub set_counters { key_values => [ { name => 'log_used' } ], output_template => 'logging disk usage: %.2f %%', perfdatas => [ - { value => 'log_used_absolute', template => '%.2f', - unit => '%', min => 0, max => 100 }, + { template => '%.2f', unit => '%', min => 0, max => 100 }, ], } }, @@ -99,7 +95,7 @@ sub set_counters { key_values => [ { name => 'resource_conservation' } ], output_template => 'resource conservation mode: %s', perfdatas => [ - { value => 'resource_conservation_absolute', template => '%s', min => 0 }, + { template => '%s', min => 0 }, ], } }, @@ -107,7 +103,7 @@ sub set_counters { key_values => [ { name => 'conn_in' } ], output_template => 'current inbound connections: %s', perfdatas => [ - { value => 'conn_in_absolute', template => '%s', min => 0 }, + { template => '%s', min => 0 }, ], } }, @@ -115,7 +111,7 @@ sub set_counters { key_values => [ { name => 'conn_out' } ], output_template => 'current outbound connections: %s', perfdatas => [ - { value => 'conn_out_absolute', template => '%s', min => 0 }, + { template => '%s', min => 0 }, ], } }, @@ -123,7 +119,7 @@ sub set_counters { key_values => [ { name => 'active_recips' } ], output_template => 'queue active recipients: %s', perfdatas => [ - { value => 'active_recips_absolute', template => '%s', min => 0 }, + { value => 'active_recips', template => '%s', min => 0 }, ], } }, @@ -131,7 +127,7 @@ sub set_counters { key_values => [ { name => 'msgs_in_quarantine' } ], output_template => 'messages in quarantine: %s', perfdatas => [ - { value => 'msgs_in_quarantine_absolute', template => '%s', min => 0 }, + { template => '%s', min => 0 }, ], } }, @@ -139,17 +135,15 @@ sub set_counters { key_values => [ { name => 'msgs_in_work_queue' } ], output_template => 'messages in work queue: %s', perfdatas => [ - { value => 'msgs_in_work_queue_absolute', template => '%s', min => 0 }, + { template => '%s', min => 0 }, ], } }, { label => 'messages-received', nlabel => 'system.queue.messages.received.persecond', set => { - key_values => [ { name => 'msgs_received_lifetime', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'msgs_received_lifetime', per_second => 1 } ], output_template => 'messages received: %.2f/s', perfdatas => [ - { value => 'msgs_received_lifetime_per_second', template => '%.2f', - unit => '/s', min => 0 }, + { template => '%.2f', unit => '/s', min => 0 }, ], } }, @@ -157,8 +151,7 @@ sub set_counters { key_values => [ { name => 'queuedisk' } ], output_template => 'queue disk usage: %.2f %%', perfdatas => [ - { value => 'queuedisk_absolute', template => '%.2f', - unit => '%', min => 0, max => 100 }, + { template => '%.2f', unit => '%', min => 0, max => 100 }, ], } }, @@ -184,7 +177,7 @@ sub new { 'warning-system-status:s' => { name => 'warning_system_status', default => '' }, 'critical-system-status:s' => { name => 'critical_system_status', default => '%{system_status} !~ /online/i' }, }); - + $self->{http} = centreon::plugins::http->new(%options); return $self; } diff --git a/centreon/common/cisco/standard/snmp/mode/cpu.pm b/centreon/common/cisco/standard/snmp/mode/cpu.pm index 592451965..d7861c5f3 100644 --- a/centreon/common/cisco/standard/snmp/mode/cpu.pm +++ b/centreon/common/cisco/standard/snmp/mode/cpu.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'average_5s' } ], output_template => '%.2f %% (5s)', perfdatas => [ - { label => 'total_cpu_5s_avg', value => 'average_5s_absolute', template => '%.2f', + { label => 'total_cpu_5s_avg', value => 'average_5s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'average_1m' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { label => 'total_cpu_1m_avg', value => 'average_1m_absolute', template => '%.2f', + { label => 'total_cpu_1m_avg', value => 'average_1m', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'average_5m' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { label => 'total_cpu_5m_avg', value => 'average_5m_absolute', template => '%.2f', + { label => 'total_cpu_5m_avg', value => 'average_5m', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -68,8 +68,8 @@ sub set_counters { key_values => [ { name => 'cpu_5s' }, { name => 'display' } ], output_template => '%.2f %% (5s)', perfdatas => [ - { label => 'cpu_5s', value => 'cpu_5s_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_5s', value => 'cpu_5s', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -77,8 +77,8 @@ sub set_counters { key_values => [ { name => 'cpu_1m' }, { name => 'display' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { label => 'cpu_1m', value => 'cpu_1m_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_1m', value => 'cpu_1m', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -86,8 +86,8 @@ sub set_counters { key_values => [ { name => 'cpu_5m' }, { name => 'display' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { label => 'cpu_5m', value => 'cpu_5m_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_5m', value => 'cpu_5m', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/cisco/standard/snmp/mode/ipsectunnel.pm b/centreon/common/cisco/standard/snmp/mode/ipsectunnel.pm index 979d30190..cabad8c65 100644 --- a/centreon/common/cisco/standard/snmp/mode/ipsectunnel.pm +++ b/centreon/common/cisco/standard/snmp/mode/ipsectunnel.pm @@ -40,16 +40,16 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Tunnels : %s', perfdatas => [ - { label => 'total_tunnels', value => 'total_absolute', template => '%s', - min => 0 }, - ], + { label => 'total_tunnels', template => '%s', min => 0 } + ] } - }, + } ]; + $self->{maps_counters}->{tunnel} = [ { label => 'traffic-in', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'In' }, closure_custom_output => $self->can('custom_traffic_output'), closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -58,7 +58,7 @@ sub set_counters { }, { label => 'traffic-out', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'Out' }, closure_custom_output => $self->can('custom_traffic_output'), closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -67,7 +67,7 @@ sub set_counters { }, { label => 'drop-in', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_drop_calc'), closure_custom_calc_extra_options => { label_ref => 'In' }, closure_custom_output => $self->can('custom_drop_output'), closure_custom_perfdata => $self->can('custom_drop_perfdata'), @@ -76,7 +76,7 @@ sub set_counters { }, { label => 'drop-out', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_drop_calc'), closure_custom_calc_extra_options => { label_ref => 'Out' }, closure_custom_output => $self->can('custom_drop_output'), closure_custom_perfdata => $self->can('custom_drop_perfdata'), @@ -87,11 +87,10 @@ sub set_counters { key_values => [ { name => 'sa' }, { name => 'display' } ], output_template => 'Total SA : %s', perfdatas => [ - { label => 'total_sa', value => 'sa_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'total_sa', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } - }, + } ]; } @@ -184,9 +183,10 @@ sub custom_drop_threshold { sub custom_drop_output { my ($self, %options) = @_; - my $msg = sprintf("Drop %s : %s pkts/s", - $self->{result_values}->{label}, $self->{result_values}->{pkts_per_seconds}); - return $msg; + return sprintf( + "Drop %s : %s pkts/s", + $self->{result_values}->{label}, $self->{result_values}->{pkts_per_seconds} + ); } sub custom_drop_calc { @@ -223,8 +223,8 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "filter-sa:s" => { name => 'filter_sa' }, + 'filter-name:s' => { name => 'filter_name' }, + 'filter-sa:s' => { name => 'filter_sa' }, }); return $self; diff --git a/centreon/common/cisco/standard/snmp/mode/ipsla.pm b/centreon/common/cisco/standard/snmp/mode/ipsla.pm index 1623c0717..30b4464ec 100644 --- a/centreon/common/cisco/standard/snmp/mode/ipsla.pm +++ b/centreon/common/cisco/standard/snmp/mode/ipsla.pm @@ -58,7 +58,7 @@ sub set_counters { ], output_template => 'Completion Time : %s', perfdatas => [ - { label => 'completion_time', value => 'rttMonLatestRttOperCompletionTime_absolute', template => '%s', + { label => 'completion_time', value => 'rttMonLatestRttOperCompletionTime', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/centreon/common/cisco/standard/snmp/mode/load.pm b/centreon/common/cisco/standard/snmp/mode/load.pm index 14e21df19..3a80c6130 100644 --- a/centreon/common/cisco/standard/snmp/mode/load.pm +++ b/centreon/common/cisco/standard/snmp/mode/load.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'cpmCPULoadAvg1min' }, { name => 'display' } ], output_template => '%.2f (1m)', perfdatas => [ - { value => 'cpmCPULoadAvg1min_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'cpmCPULoadAvg1min', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'cpmCPULoadAvg5min' }, { name => 'display' } ], output_template => '%.2f (5m)', perfdatas => [ - { value => 'cpmCPULoadAvg5min_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'cpmCPULoadAvg5min', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'cpmCPULoadAvg15min' }, { name => 'display' } ], output_template => '%.2f (15m)', perfdatas => [ - { value => 'cpmCPULoadAvg15min_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'cpmCPULoadAvg15min', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/cisco/standard/snmp/mode/memoryflash.pm b/centreon/common/cisco/standard/snmp/mode/memoryflash.pm index bf31fcf72..f2ac0776b 100644 --- a/centreon/common/cisco/standard/snmp/mode/memoryflash.pm +++ b/centreon/common/cisco/standard/snmp/mode/memoryflash.pm @@ -37,11 +37,11 @@ sub custom_mem_output { my ($self, %options) = @_; my $msg = sprintf("Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute}); + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free}); return $msg; } @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_mem_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_mem_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'free', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/cisco/standard/snmp/mode/qosusage.pm b/centreon/common/cisco/standard/snmp/mode/qosusage.pm index 79708b47f..77a88387f 100644 --- a/centreon/common/cisco/standard/snmp/mode/qosusage.pm +++ b/centreon/common/cisco/standard/snmp/mode/qosusage.pm @@ -39,7 +39,6 @@ sub set_counters { $self->{maps_counters}->{interface_classmap} = [ { label => 'int-cmap-traffic', set => { key_values => [ { name => 'traffic_usage', diff => 1 }, { name => 'total' }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_output => $self->can('custom_traffic_output'), closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -47,34 +46,34 @@ sub set_counters { } }, { label => 'int-cmap-drop', set => { - key_values => [ { name => 'drop_usage', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'drop_usage', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Drop : %s %s/s', perfdatas => [ - { label => 'icmap_drop', value => 'drop_usage_per_second', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'icmap_drop', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } ]; $self->{maps_counters}->{classmap} = [ { label => 'cmap-traffic', set => { - key_values => [ { name => 'traffic_usage', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_usage', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic : %s %s/s', perfdatas => [ - { label => 'cmap_traffic', value => 'traffic_usage_per_second', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'cmap_traffic', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'cmap-drop', set => { - key_values => [ { name => 'drop_usage', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'drop_usage', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Drop : %s %s/s', perfdatas => [ - { label => 'cmap_drop', value => 'drop_usage_per_second', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'cmap_drop', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -82,22 +81,20 @@ sub set_counters { $self->{maps_counters}->{total} = [ { label => 'total-traffic', set => { - key_values => [ { name => 'traffic_usage', diff => 1 } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_usage', per_second => 1 } ], + output_change_bytes => 2, output_template => 'Total Traffic : %s %s/s', perfdatas => [ - { label => 'total_traffic', value => 'traffic_usage_per_second', template => '%d', - unit => 'b/s', min => 0 } + { label => 'total_traffic', template => '%d', unit => 'b/s', min => 0 } ] } }, { label => 'total-drop', set => { - key_values => [ { name => 'drop_usage', diff => 1 } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'drop_usage', per_second => 1 } ], + output_change_bytes => 2, output_template => 'Total Drop : %s %s/s', perfdatas => [ - { label => 'total_drop', value => 'drop_usage_per_second', template => '%d', - unit => 'b/s', min => 0 } + { label => 'total_drop', template => '%d', unit => 'b/s', min => 0 } ] } } diff --git a/centreon/common/cisco/standard/snmp/mode/sessions.pm b/centreon/common/cisco/standard/snmp/mode/sessions.pm index 72eee68d2..48b81a6c0 100644 --- a/centreon/common/cisco/standard/snmp/mode/sessions.pm +++ b/centreon/common/cisco/standard/snmp/mode/sessions.pm @@ -38,8 +38,7 @@ sub set_counters { key_values => [ { name => 'cufwConnGlobalNumActive' } ], output_template => 'current : %s', output_error_template => "current : %s", perfdatas => [ - { label => 'connections_current', value => 'cufwConnGlobalNumActive_absolute', template => '%d', - min => 0 }, + { label => 'connections_current', template => '%d', min => 0 }, ], } }, @@ -47,8 +46,7 @@ sub set_counters { key_values => [ { name => 'cufwConnGlobalConnSetupRate1' } ], output_template => 'average last 1min : %s', output_error_template => "average last 1min : %s", perfdatas => [ - { label => 'connections_1m', value => 'cufwConnGlobalConnSetupRate1_absolute', template => '%d', - min => 0 }, + { label => 'connections_1m', template => '%d', min => 0 }, ], } }, @@ -56,19 +54,18 @@ sub set_counters { key_values => [ { name => 'cufwConnGlobalConnSetupRate5' } ], output_template => 'average last 5min : %s', output_error_template => "average last 5min : %s", perfdatas => [ - { label => 'connections_5m', value => 'cufwConnGlobalConnSetupRate5_absolute', template => '%d', - min => 0 }, + { label => 'connections_5m', template => '%d', min => 0 }, ], } }, ]; + $self->{maps_counters}->{sessions} = [ { label => 'sessions-total', set => { key_values => [ { name => 'crasNumSessions' } ], output_template => 'total : %s', output_error_template => "total : %s", perfdatas => [ - { label => 'sessions_total', value => 'crasNumSessions_absolute', template => '%d', - min => 0 }, + { label => 'sessions_total', template => '%d', min => 0 }, ], } }, @@ -76,18 +73,15 @@ sub set_counters { key_values => [ { name => 'crasEmailNumSessions' } ], output_template => 'current email proxy : %s', output_error_template => "current email proxy : %s", perfdatas => [ - { label => 'sessions_email_current', value => 'crasEmailNumSessions_absolute', template => '%d', - min => 0 }, + { label => 'sessions_email_current', template => '%d', min => 0 }, ], } }, { label => 'sessions-email-psec', set => { - key_values => [ { name => 'crasEmailCumulateSessions', diff => 1 } ], + key_values => [ { name => 'crasEmailCumulateSessions', per_second => 1 } ], output_template => 'email proxy : %.2f/s', output_error_template => "email proxy : %s", - per_second => 1, perfdatas => [ - { label => 'sessions_email_psec', value => 'crasEmailCumulateSessions_per_second', template => '%.2f', - min => 0 }, + { label => 'sessions_email_psec', template => '%.2f', min => 0 }, ], } }, @@ -95,18 +89,15 @@ sub set_counters { key_values => [ { name => 'crasIPSecNumSessions' } ], output_template => 'current ipsec : %s', output_error_template => "current ipsec : %s", perfdatas => [ - { label => 'sessions_ipsec_current', value => 'crasIPSecNumSessions_absolute', template => '%d', - min => 0 }, + { label => 'sessions_ipsec_current', template => '%d', min => 0 }, ], } }, { label => 'sessions-ipsec-psec', set => { - key_values => [ { name => 'crasIPSecCumulateSessions', diff => 1 } ], + key_values => [ { name => 'crasIPSecCumulateSessions', per_second => 1 } ], output_template => 'ipsec : %.2f/s', output_error_template => "ipsec : %s", - per_second => 1, perfdatas => [ - { label => 'sessions_ipsec_psec', value => 'crasIPSecCumulateSessions_per_second', template => '%.2f', - min => 0 }, + { label => 'sessions_ipsec_psec', template => '%.2f', min => 0 }, ], } }, @@ -114,18 +105,15 @@ sub set_counters { key_values => [ { name => 'crasL2LNumSessions' } ], output_template => 'current LAN to LAN : %s', output_error_template => "current LAN to LAN : %s", perfdatas => [ - { label => 'sessions_l2l_current', value => 'crasL2LNumSessions_absolute', template => '%d', - min => 0 }, + { label => 'sessions_l2l_current', template => '%d', min => 0 }, ], } }, { label => 'sessions-l2l-psec', set => { - key_values => [ { name => 'crasL2LCumulateSessions', diff => 1 } ], + key_values => [ { name => 'crasL2LCumulateSessions', per_second => 1 } ], output_template => 'LAN to LAN : %.2f/s', output_error_template => "LAN to LAN : %s", - per_second => 1, perfdatas => [ - { label => 'sessions_l2l_psec', value => 'crasL2LCumulateSessions_per_second', template => '%.2f', - min => 0 }, + { label => 'sessions_l2l_psec', template => '%.2f', min => 0 }, ], } }, @@ -133,18 +121,15 @@ sub set_counters { key_values => [ { name => 'crasLBNumSessions' } ], output_template => 'current load balancing : %s', output_error_template => "current load balancing : %s", perfdatas => [ - { label => 'sessions_lb_current', value => 'crasLBNumSessions_absolute', template => '%d', - min => 0 }, + { label => 'sessions_lb_current', template => '%d', min => 0 }, ], } }, { label => 'sessions-lb-psec', set => { - key_values => [ { name => 'crasLBCumulateSessions', diff => 1 } ], + key_values => [ { name => 'crasLBCumulateSessions', per_second => 1 } ], output_template => 'load balancing : %.2f/s', output_error_template => "load balancing : %s", - per_second => 1, perfdatas => [ - { label => 'sessions_lb_psec', value => 'crasLBCumulateSessions_per_second', template => '%.2f', - min => 0 }, + { label => 'sessions_lb_psec', template => '%.2f', min => 0 }, ], } }, @@ -152,18 +137,15 @@ sub set_counters { key_values => [ { name => 'crasSVCNumSessions' } ], output_template => 'current SVC : %s', output_error_template => "current SVC : %s", perfdatas => [ - { label => 'sessions_svc_current', value => 'crasSVCNumSessions_absolute', template => '%d', - min => 0 }, + { label => 'sessions_svc_current', template => '%d', min => 0 }, ], } }, { label => 'sessions-svc-psec', set => { - key_values => [ { name => 'crasSVCCumulateSessions', diff => 1 } ], + key_values => [ { name => 'crasSVCCumulateSessions', per_second => 1 } ], output_template => 'SVC : %.2f/s', output_error_template => "SVC : %s", - per_second => 1, perfdatas => [ - { label => 'sessions_svc_psec', value => 'crasSVCCumulateSessions_per_second', template => '%.2f', - min => 0 }, + { label => 'sessions_svc_psec', template => '%.2f', min => 0 }, ], } }, @@ -171,18 +153,15 @@ sub set_counters { key_values => [ { name => 'crasWebvpnNumSessions' } ], output_template => 'current webvpn : %s', output_error_template => "current webvpn : %s", perfdatas => [ - { label => 'sessions_webvpn_current', value => 'crasWebvpnNumSessions_absolute', template => '%d', - min => 0 }, + { label => 'sessions_webvpn_current', template => '%d', min => 0 }, ], } }, { label => 'sessions-webvpn-psec', set => { - key_values => [ { name => 'crasWebvpnCumulateSessions', diff => 1 } ], + key_values => [ { name => 'crasWebvpnCumulateSessions', per_second => 1 } ], output_template => 'webvpn : %.2f/s', output_error_template => "webvpn : %s", - per_second => 1, perfdatas => [ - { label => 'sessions_webvpn_psec', value => 'crasWebvpnCumulateSessions_per_second', template => '%.2f', - min => 0 }, + { label => 'sessions_webvpn_psec',template => '%.2f', min => 0 }, ], } }, @@ -205,11 +184,10 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); - + + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/centreon/common/cisco/standard/snmp/mode/stack.pm b/centreon/common/cisco/standard/snmp/mode/stack.pm index 88ba6792e..35c923df6 100644 --- a/centreon/common/cisco/standard/snmp/mode/stack.pm +++ b/centreon/common/cisco/standard/snmp/mode/stack.pm @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'waiting' } ], output_template => 'Waiting: %d', perfdatas => [ - { label => 'waiting', value => 'waiting_absolute', template => '%d', + { label => 'waiting', value => 'waiting', template => '%d', min => 0 }, ], } @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'progressing' } ], output_template => 'Progressing: %d', perfdatas => [ - { label => 'progressing', value => 'progressing_absolute', template => '%d', + { label => 'progressing', value => 'progressing', template => '%d', min => 0 }, ], } @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'added' } ], output_template => 'Added: %d', perfdatas => [ - { label => 'added', value => 'added_absolute', template => '%d', + { label => 'added', value => 'added', template => '%d', min => 0 }, ], } @@ -104,7 +104,7 @@ sub set_counters { key_values => [ { name => 'ready' } ], output_template => 'Ready: %d', perfdatas => [ - { label => 'ready', value => 'ready_absolute', template => '%d', + { label => 'ready', value => 'ready', template => '%d', min => 0 }, ], } @@ -113,7 +113,7 @@ sub set_counters { key_values => [ { name => 'sdmMismatch' } ], output_template => 'SDM Mismatch: %d', perfdatas => [ - { label => 'sdm_mismatch', value => 'sdmMismatch_absolute', template => '%d', + { label => 'sdm_mismatch', value => 'sdmMismatch', template => '%d', min => 0 }, ], } @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'verMismatch' } ], output_template => 'Version Mismatch: %d', perfdatas => [ - { label => 'version_mismatch', value => 'verMismatch_absolute', template => '%d', + { label => 'version_mismatch', value => 'verMismatch', template => '%d', min => 0 }, ], } @@ -131,7 +131,7 @@ sub set_counters { key_values => [ { name => 'featureMismatch' } ], output_template => 'Feature Mismatch: %d', perfdatas => [ - { label => 'feature_mismatch', value => 'featureMismatch_absolute', template => '%d', + { label => 'feature_mismatch', value => 'featureMismatch', template => '%d', min => 0 }, ], } @@ -140,7 +140,7 @@ sub set_counters { key_values => [ { name => 'newMasterInit' } ], output_template => 'New Master Init: %d', perfdatas => [ - { label => 'new_master_init', value => 'newMasterInit_absolute', template => '%d', + { label => 'new_master_init', value => 'newMasterInit', template => '%d', min => 0 }, ], } @@ -149,7 +149,7 @@ sub set_counters { key_values => [ { name => 'provisioned' } ], output_template => 'Provisioned: %d', perfdatas => [ - { label => 'provisioned', value => 'provisioned_absolute', template => '%d', + { label => 'provisioned', value => 'provisioned', template => '%d', min => 0 }, ], } @@ -158,7 +158,7 @@ sub set_counters { key_values => [ { name => 'invalid' } ], output_template => 'Invalid: %d', perfdatas => [ - { label => 'invalid', value => 'invalid_absolute', template => '%d', + { label => 'invalid', value => 'invalid', template => '%d', min => 0 }, ], } @@ -167,7 +167,7 @@ sub set_counters { key_values => [ { name => 'removed' } ], output_template => 'Removed: %d', perfdatas => [ - { label => 'removed', value => 'removed_absolute', template => '%d', + { label => 'removed', value => 'removed', template => '%d', min => 0 }, ], } diff --git a/centreon/common/cisco/standard/snmp/mode/voicecall.pm b/centreon/common/cisco/standard/snmp/mode/voicecall.pm index 8db776d07..694541e22 100644 --- a/centreon/common/cisco/standard/snmp/mode/voicecall.pm +++ b/centreon/common/cisco/standard/snmp/mode/voicecall.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'active_1m_average' } ], output_template => '%.2f (1m)', perfdatas => [ - { value => 'active_1m_average_absolute', template => '%.2f', min => 0 }, + { value => 'active_1m_average', template => '%.2f', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'active_5m_average' } ], output_template => '%.2f (5m)', perfdatas => [ - { value => 'active_5m_average_absolute', template => '%.2f', min => 0 }, + { value => 'active_5m_average', template => '%.2f', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'active_15m_average' } ], output_template => '%.2f (15m)', perfdatas => [ - { value => 'active_15m_average_absolute', template => '%.2f', min => 0 }, + { value => 'active_15m_average', template => '%.2f', min => 0 }, ], } }, @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'active_calls' }, { name => 'display' } ], output_template => 'active calls %s', perfdatas => [ - { value => 'active_calls_absolute', template => '%s', + { value => 'active_calls', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/centreon/common/cisco/standard/snmp/mode/wan3g.pm b/centreon/common/cisco/standard/snmp/mode/wan3g.pm index da72efd56..8722adb2e 100644 --- a/centreon/common/cisco/standard/snmp/mode/wan3g.pm +++ b/centreon/common/cisco/standard/snmp/mode/wan3g.pm @@ -130,8 +130,8 @@ sub set_counters { output_template => 'memory used: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'temperature_absolute', template => '%s', min => 0, - unit => 'C', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, + unit => 'C', label_extra_instance => 1, instance_use => 'display' } ] } } @@ -151,8 +151,8 @@ sub set_counters { output_template => 'received signal strength: %s dBm', output_change_bytes => 1, perfdatas => [ - { value => 'rssi_absolute', template => '%s', min => 0, - unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, + unit => 'dBm', label_extra_instance => 1, instance_use => 'display' } ] } } @@ -168,22 +168,20 @@ sub set_counters { } }, { label => 'traffic-in', nlabel => 'modem.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-out', nlabel => 'modem.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'traffic out: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/centreon/common/cps/ups/snmp/mode/batterystatus.pm b/centreon/common/cps/ups/snmp/mode/batterystatus.pm index f768e980a..5b4d63b14 100644 --- a/centreon/common/cps/ups/snmp/mode/batterystatus.pm +++ b/centreon/common/cps/ups/snmp/mode/batterystatus.pm @@ -36,8 +36,8 @@ sub custom_load_output { my ($self, %options) = @_; return sprintf("charge remaining: %s%% (%s minutes remaining)", - $self->{result_values}->{charge_remain_absolute}, - $self->{result_values}->{minute_remain_absolute} + $self->{result_values}->{charge_remain}, + $self->{result_values}->{minute_remain} ); } @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'charge_remain' }, { name => 'minute_remain' } ], closure_custom_output => $self->can('custom_load_output'), perfdatas => [ - { value => 'charge_remain_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { value => 'charge_remain', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'voltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'voltage_absolute', template => '%s', unit => 'V' }, + { value => 'voltage', template => '%s', unit => 'V' }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'temperature', no_value => 0 } ], output_template => 'temperature: %s C', perfdatas => [ - { value => 'temperature_absolute', template => '%s', unit => 'C' }, + { value => 'temperature', template => '%s', unit => 'C' }, ], } }, diff --git a/centreon/common/cps/ups/snmp/mode/inputlines.pm b/centreon/common/cps/ups/snmp/mode/inputlines.pm index 9a01cc2da..7c7b310d9 100644 --- a/centreon/common/cps/ups/snmp/mode/inputlines.pm +++ b/centreon/common/cps/ups/snmp/mode/inputlines.pm @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'voltage_absolute', template => '%.2f', unit => 'V' }, + { value => 'voltage', template => '%.2f', unit => 'V' }, ], } }, @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'frequence' } ], output_template => 'Frequence : %.2f Hz', perfdatas => [ - { value => 'frequence_absolute', template => '%.2f', min => 0, unit => 'Hz' }, + { value => 'frequence', template => '%.2f', min => 0, unit => 'Hz' }, ], } }, diff --git a/centreon/common/cps/ups/snmp/mode/outputlines.pm b/centreon/common/cps/ups/snmp/mode/outputlines.pm index f798b6634..3c12a2eba 100644 --- a/centreon/common/cps/ups/snmp/mode/outputlines.pm +++ b/centreon/common/cps/ups/snmp/mode/outputlines.pm @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'load' } ], output_template => 'Load : %.2f %%', perfdatas => [ - { value => 'load_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'load', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'Current : %.2f A', perfdatas => [ - { value => 'current_absolute', template => '%.2f', min => 0, unit => 'A' }, + { value => 'current', template => '%.2f', min => 0, unit => 'A' }, ], } }, @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'voltage_absolute', template => '%.2f', unit => 'V' }, + { value => 'voltage', template => '%.2f', unit => 'V' }, ], } }, @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'power' } ], output_template => 'Power : %.2f W', perfdatas => [ - { value => 'power_absolute', template => '%.2f', min => 0, unit => 'W' }, + { value => 'power', template => '%.2f', min => 0, unit => 'W' }, ], } }, @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'frequence' } ], output_template => 'Frequence : %.2f Hz', perfdatas => [ - { value => 'frequence_absolute', template => '%.2f', min => 0, unit => 'Hz' }, + { value => 'frequence', template => '%.2f', min => 0, unit => 'Hz' }, ], } }, diff --git a/centreon/common/emc/navisphere/mode/controller.pm b/centreon/common/emc/navisphere/mode/controller.pm index 3cd39ff25..96b85c043 100644 --- a/centreon/common/emc/navisphere/mode/controller.pm +++ b/centreon/common/emc/navisphere/mode/controller.pm @@ -50,23 +50,19 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'read-iops', nlabel => 'controller.io.read.usage.iops', set => { - key_values => [ { name => 'read', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'read', per_second => 1 } ], output_template => 'Read IOPs : %.2f', perfdatas => [ - { value => 'read_per_second', template => '%.2f', - unit => 'iops', min => 0 }, - ], + { template => '%.2f', unit => 'iops', min => 0 } + ] } }, { label => 'write-iops', nlabel => 'controller.io.write.usage.iops', set => { - key_values => [ { name => 'write', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'write', per_second => 1 } ], output_template => 'Write IOPs : %.2f', perfdatas => [ - { value => 'write_per_second', template => '%.2f', - unit => 'iops', min => 0 }, - ], + { template => '%.2f', unit => 'iops', min => 0 } + ] } }, { label => 'busy', nlabel => 'controller.busy.usage.percentage', set => { @@ -75,11 +71,10 @@ sub set_counters { output_template => 'Busy : %.2f %%', output_use => 'busy_prct', threshold_use => 'busy_prct', perfdatas => [ - { value => 'busy_prct', template => '%.2f', - unit => '%', min => 0, max => 100 }, - ], + { value => 'busy_prct', template => '%.2f', unit => '%', min => 0, max => 100 } + ] } - }, + } ]; } diff --git a/centreon/common/emc/navisphere/mode/disk.pm b/centreon/common/emc/navisphere/mode/disk.pm index 6adce83f0..31150f09a 100644 --- a/centreon/common/emc/navisphere/mode/disk.pm +++ b/centreon/common/emc/navisphere/mode/disk.pm @@ -109,8 +109,8 @@ sub set_counters { key_values => [ { name => 'hard_read_errors', diff => 1 }, { name => 'display' } ], output_template => 'Hard Read Errors : %d', perfdatas => [ - { label => 'hard_read_errors', value => 'hard_read_errors_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'hard_read_errors', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -118,28 +118,28 @@ sub set_counters { key_values => [ { name => 'hard_write_errors', diff => 1 }, { name => 'display' } ], output_template => 'Hard Write Errors : %d', perfdatas => [ - { label => 'hard_write_errors', value => 'hard_write_errors_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'hard_write_errors', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-io', set => { - key_values => [ { name => 'read_io', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'read_io', per_second => 1 }, { name => 'display' } ], output_template => 'Read I/O : %s %s/s', - per_second => 1, output_change_bytes => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'read_io', value => 'read_io_absolute', template => '%s', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_io', template => '%s', + min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-io', set => { - key_values => [ { name => 'write_io', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'write_io', per_second => 1 }, { name => 'display' } ], output_template => 'Write I/O : %s %s/s', - per_second => 1, output_change_bytes => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'write_io', value => 'write_io_absolute', template => '%s', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_io', template => '%s', + min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -168,8 +168,8 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-raidgroupid:s" => { name => 'filter_raidgroupid', }, - "filter-disk:s" => { name => 'filter_disk', }, + 'filter-raidgroupid:s' => { name => 'filter_raidgroupid', }, + 'filter-disk:s' => { name => 'filter_disk', }, }); return $self; diff --git a/centreon/common/force10/snmp/mode/cpu.pm b/centreon/common/force10/snmp/mode/cpu.pm index 170448c71..d847213a6 100644 --- a/centreon/common/force10/snmp/mode/cpu.pm +++ b/centreon/common/force10/snmp/mode/cpu.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'usage_5s' }, { name => 'display' } ], output_template => '%s %% (5sec)', output_error_template => "%s (5sec)", perfdatas => [ - { label => 'cpu_5s', value => 'usage_5s_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_5s', value => 'usage_5s', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'usage_1m' }, { name => 'display' } ], output_template => '%s %% (1m)', output_error_template => "%s (1min)", perfdatas => [ - { label => 'cpu_1m', value => 'usage_1m_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_1m', value => 'usage_1m', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'usage_5m' }, { name => 'display' } ], output_template => '%s %% (5min)', output_error_template => "%s (5min)", perfdatas => [ - { label => 'cpu_5m', value => 'usage_5m_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_5m', value => 'usage_5m', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/force10/snmp/mode/memory.pm b/centreon/common/force10/snmp/mode/memory.pm index a8ca4514f..ffb3ad286 100644 --- a/centreon/common/force10/snmp/mode/memory.pm +++ b/centreon/common/force10/snmp/mode/memory.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'usage' }, { name => 'display' } ], output_template => '%s %%', output_error_template => "%s", perfdatas => [ - { label => 'used', value => 'usage_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'usage', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/fortinet/fortigate/snmp/mode/apusage.pm b/centreon/common/fortinet/fortigate/snmp/mode/apusage.pm index cc73dfa16..e6319f0d8 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/apusage.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/apusage.pm @@ -59,22 +59,22 @@ sub set_counters { } }, { label => 'in-traffic', set => { - key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'in', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'traffic in : %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'out-traffic', set => { - key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'out', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'traffic out : %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'clients' }, { name => 'display' } ], output_template => 'current client connections : %s', perfdatas => [ - { label => 'clients', value => 'clients_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'clients', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -91,8 +91,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'display' } ], output_template => 'cpu usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -100,8 +100,8 @@ sub set_counters { key_values => [ { name => 'memory' }, { name => 'display' } ], output_template => 'memory usage : %.2f %%', perfdatas => [ - { label => 'memory', value => 'memory_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'memory', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/fortinet/fortigate/snmp/mode/clusterstatus.pm b/centreon/common/fortinet/fortigate/snmp/mode/clusterstatus.pm index c767da49b..fa4927cc8 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/clusterstatus.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/clusterstatus.pm @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'total_nodes' } ], output_template => 'Total nodes: %d', perfdatas => [ - { label => 'total_nodes', value => 'total_nodes_absolute', template => '%d', + { label => 'total_nodes', value => 'total_nodes', template => '%d', min => 0 }, ], } @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'synchronized' } ], output_template => 'Synchronized: %d', perfdatas => [ - { label => 'synchronized_nodes', value => 'synchronized_absolute', template => '%d', + { label => 'synchronized_nodes', value => 'synchronized', template => '%d', min => 0 }, ], } @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'not_synchronized' } ], output_template => 'Not Synchronized: %d', perfdatas => [ - { label => 'not_synchronized_nodes', value => 'not_synchronized_absolute', template => '%d', + { label => 'not_synchronized_nodes', value => 'not_synchronized', template => '%d', min => 0 }, ], } @@ -90,7 +90,7 @@ sub set_counters { key_values => [ { name => 'total_checksums' } ], output_template => 'Total Checksums: %d', perfdatas => [ - { label => 'total_checksums', value => 'total_checksums_absolute', template => '%d', min => 0 }, + { label => 'total_checksums', value => 'total_checksums', template => '%d', min => 0 }, ], } }, diff --git a/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm b/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm index 245ce76e6..5ec2209d9 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'average' } ], output_template => 'CPU(s) average usage is: %.2f %%', perfdatas => [ - { label => 'total_cpu_avg', value => 'average_absolute', template => '%.2f', + { label => 'total_cpu_avg', value => 'average', template => '%.2f', min => 0, max => 100, unit => '%' }, ] } @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'cpu' } ], output_template => 'usage: %.2f %%', perfdatas => [ - { value => 'cpu_absolute', template => '%.2f', + { value => 'cpu', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ] } @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'cpu' } ], output_template => 'CPU usage: %.2f %%', perfdatas => [ - { value => 'cpu_absolute', template => '%.2f', + { value => 'cpu', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ] } diff --git a/centreon/common/fortinet/fortigate/snmp/mode/ipsstats.pm b/centreon/common/fortinet/fortigate/snmp/mode/ipsstats.pm index ae03d8b81..8221f1577 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/ipsstats.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/ipsstats.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'fgIpsIntrusionsDetected', diff => 1 }, { name => 'display' } ], output_template => 'Intrusions detected : %s', perfdatas => [ - { label => 'intrusions_detected', value => 'fgIpsIntrusionsDetected_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'intrusions_detected', value => 'fgIpsIntrusionsDetected', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'fgIpsIntrusionsBlocked', diff => 1 }, { name => 'display' } ], output_template => 'Intrusions blocked : %s', perfdatas => [ - { label => 'intrusions_blocked', value => 'fgIpsIntrusionsBlocked_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'intrusions_blocked', value => 'fgIpsIntrusionsBlocked', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'fgIpsCritSevDetections', diff => 1 }, { name => 'display' } ], output_template => 'Critical severity intrusions detected : %s', perfdatas => [ - { label => 'crit_sev_detections', value => 'fgIpsCritSevDetections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'crit_sev_detections', value => 'fgIpsCritSevDetections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'fgIpsHighSevDetections', diff => 1 }, { name => 'display' } ], output_template => 'High severity intrusions detected : %s', perfdatas => [ - { label => 'high_sev_detections', value => 'fgIpsHighSevDetections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'high_sev_detections', value => 'fgIpsHighSevDetections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'fgIpsMedSevDetections', diff => 1 }, { name => 'display' } ], output_template => 'Medium severity intrusions detected : %s', perfdatas => [ - { label => 'med_sev_detections', value => 'fgIpsMedSevDetections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'med_sev_detections', value => 'fgIpsMedSevDetections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'fgIpsLowSevDetections', diff => 1 }, { name => 'display' } ], output_template => 'Low severity intrusions detected : %s', perfdatas => [ - { label => 'low_sev_detections', value => 'fgIpsLowSevDetections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'low_sev_detections', value => 'fgIpsLowSevDetections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'fgIpsInfoSevDetections', diff => 1 }, { name => 'display' } ], output_template => 'Informational severity intrusions detected : %s', perfdatas => [ - { label => 'info_sev_detections', value => 'fgIpsInfoSevDetections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'info_sev_detections', value => 'fgIpsInfoSevDetections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -101,8 +101,8 @@ sub set_counters { key_values => [ { name => 'fgIpsSignatureDetections', diff => 1 }, { name => 'display' } ], output_template => 'Signature intrusions detected : %s', perfdatas => [ - { label => 'signature_detection', value => 'fgIpsSignatureDetections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'signature_detection', value => 'fgIpsSignatureDetections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -110,8 +110,8 @@ sub set_counters { key_values => [ { name => 'fgIpsAnomalyDetections', diff => 1 }, { name => 'display' } ], output_template => 'Anomaly intrusions detected : %s', perfdatas => [ - { label => 'anomaly_detections', value => 'fgIpsAnomalyDetections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'anomaly_detections', value => 'fgIpsAnomalyDetections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/fortinet/fortigate/snmp/mode/memory.pm b/centreon/common/fortinet/fortigate/snmp/mode/memory.pm index 1b6fff7fa..2e018ba2d 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/memory.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/memory.pm @@ -29,11 +29,11 @@ sub custom_usage_output { my ($self, %options) = @_; return sprintf("memory total: %s %s used: %s %s (%.2f%%) free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ] } @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ] } @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'memory used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' } ] } @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'memory' } ], output_template => 'memory used: %.2f %%', perfdatas => [ - { value => 'memory_absolute', template => '%.2f', + { value => 'memory', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ] } diff --git a/centreon/common/fortinet/fortigate/snmp/mode/signatures.pm b/centreon/common/fortinet/fortigate/snmp/mode/signatures.pm index 83ce6cbe0..851592aa7 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/signatures.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/signatures.pm @@ -39,10 +39,10 @@ sub set_counters { $self->{maps_counters}->{av} = [ { label => 'av', set => { key_values => [ { name => 'human' }, { name => 'value' } ], - threshold_use => 'value_absolute', + threshold_use => 'value', output_template => "last refresh is: '%s'", perfdatas => [ - { label => 'av_update', value => 'value_absolute', + { label => 'av_update', value => 'value', template => '%d', min => 0, unit => 's' }, ], } @@ -51,10 +51,10 @@ sub set_counters { $self->{maps_counters}->{avet} = [ { label => 'avet', set => { key_values => [ { name => 'human' }, { name => 'value' } ], - threshold_use => 'value_absolute', + threshold_use => 'value', output_template => "last refresh is: '%s'", perfdatas => [ - { label => 'avet_update', value => 'value_absolute', + { label => 'avet_update', value => 'value', template => '%d', min => 0, unit => 's' }, ], } @@ -63,10 +63,10 @@ sub set_counters { $self->{maps_counters}->{ips} = [ { label => 'ips', set => { key_values => [ { name => 'human' }, { name => 'value' } ], - threshold_use => 'value_absolute', + threshold_use => 'value', output_template => "last refresh is: '%s'", perfdatas => [ - { label => 'ips_update', value => 'value_absolute', + { label => 'ips_update', value => 'value', template => '%d', min => 0, unit => 's' }, ], } @@ -75,10 +75,10 @@ sub set_counters { $self->{maps_counters}->{ipset} = [ { label => 'ipset', set => { key_values => [ { name => 'human' }, { name => 'value' } ], - threshold_use => 'value_absolute', + threshold_use => 'value', output_template => "last refresh is: '%s'", perfdatas => [ - { label => 'ipset_update', value => 'value_absolute', + { label => 'ipset_update', value => 'value', template => '%d', min => 0, unit => 's' }, ], } diff --git a/centreon/common/fortinet/fortigate/snmp/mode/vdomusage.pm b/centreon/common/fortinet/fortigate/snmp/mode/vdomusage.pm index c2842db05..81449e3db 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/vdomusage.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/vdomusage.pm @@ -42,9 +42,9 @@ sub custom_license_output { return sprintf( 'number of virtual domains used: %s/%s (%.2f%%)', - $self->{result_values}->{used_absolute}, - $self->{result_values}->{total_absolute}, - $self->{result_values}->{prct_used_absolute} + $self->{result_values}->{used}, + $self->{result_values}->{total}, + $self->{result_values}->{prct_used} ); } @@ -114,7 +114,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_license_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute' } + { template => '%d', min => 0, max => 'total' } ] } }, @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_license_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute' } + { template => '%d', min => 0, max => 'total' } ] } }, @@ -130,7 +130,7 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'free' }, { name => 'used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_license_output'), perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' } + { template => '%.2f', min => 0, max => 100, unit => '%' } ] } } @@ -141,8 +141,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'display' } ], output_template => 'cpu usage: %.2f%%', perfdatas => [ - { value => 'cpu_absolute', template => '%.2f', unit => '%', min => 0, max => 100, - label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%.2f', unit => '%', min => 0, max => 100, + label_extra_instance => 1, instance_use => 'display' } ] } } @@ -153,8 +153,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'memory used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' } ], } } @@ -165,8 +165,7 @@ sub set_counters { key_values => [ { name => 'active_policies' }, { name => 'display' } ], output_template => 'active policies: %d', perfdatas => [ - { value => 'active_policies_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ] } } @@ -177,8 +176,7 @@ sub set_counters { key_values => [ { name => 'active_sessions' }, { name => 'display' } ], output_template => 'active sessions: %d', perfdatas => [ - { value => 'active_sessions_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ] } }, @@ -186,8 +184,7 @@ sub set_counters { key_values => [ { name => 'session_rate' }, { name => 'display' } ], output_template => 'session setup rate: %d/s', perfdatas => [ - { value => 'session_rate_absolute', template => '%d', - min => 0, unit => '/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, unit => '/s', label_extra_instance => 1, instance_use => 'display' } ] } } @@ -207,7 +204,7 @@ sub set_counters { $self->{maps_counters}->{vdom_traffic} = [ { label => 'traffic-in', nlabel => 'virtualdomain.traffic.in.bitspersecond', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, output_template => 'traffic in: %s%s/s', output_use => 'traffic_per_second', threshold_use => 'traffic_per_second', @@ -220,7 +217,7 @@ sub set_counters { }, { label => 'traffic-out', nlabel => 'virtualdomain.traffic.out.bitspersecond', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, output_template => 'traffic out: %s%s/s', output_use => 'traffic_per_second', threshold_use => 'traffic_per_second', diff --git a/centreon/common/fortinet/fortigate/snmp/mode/virus.pm b/centreon/common/fortinet/fortigate/snmp/mode/virus.pm index 7b9e2d98b..b09426a87 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/virus.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/virus.pm @@ -38,18 +38,17 @@ sub set_counters { key_values => [ { name => 'fgAvVirusDetected', diff => 1 }, { name => 'display' } ], output_template => 'virus detected: %s', perfdatas => [ - { label => 'virus_detected', value => 'fgAvVirusDetected_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'virus_detected', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'virus-detected-psec', nlabel => 'domain.virus.detected.persecond', display_ok => 0, set => { - key_values => [ { name => 'fgAvVirusDetected', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'fgAvVirusDetected', per_second => 1 }, { name => 'display' } ], output_template => 'virus detected: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'domain.virus.detected.persecond', value => 'fgAvVirusDetected_per_second', template => '%.2f', - unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'domain.virus.detected.persecond', template => '%.2f', + unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -57,18 +56,17 @@ sub set_counters { key_values => [ { name => 'fgAvVirusBlocked', diff => 1 }, { name => 'display' } ], output_template => 'virus blocked: %s', perfdatas => [ - { label => 'virus_blocked', value => 'fgAvVirusBlocked_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'virus_blocked', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'virus-blocked-psec', nlabel => 'domain.virus.blocked.persecond', display_ok => 0, set => { - key_values => [ { name => 'fgAvVirusBlocked', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'fgAvVirusBlocked', per_second => 1 }, { name => 'display' } ], output_template => 'virus blocked: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'domain.virus.blocked.persecond', value => 'fgAvVirusBlocked_per_second', template => '%.2f', - unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'domain.virus.blocked.persecond', template => '%.2f', + unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } } diff --git a/centreon/common/fortinet/fortigate/snmp/mode/vpn.pm b/centreon/common/fortinet/fortigate/snmp/mode/vpn.pm index 62e277480..dc86ee83b 100644 --- a/centreon/common/fortinet/fortigate/snmp/mode/vpn.pm +++ b/centreon/common/fortinet/fortigate/snmp/mode/vpn.pm @@ -58,8 +58,7 @@ sub set_counters { key_values => [ { name => 'users' } ], output_template => 'Logged users: %s', perfdatas => [ - { label => 'users', value => 'users_absolute', template => '%d', - min => 0, unit => 'users', label_extra_instance => 1 }, + { label => 'users', template => '%d', min => 0, unit => 'users', label_extra_instance => 1 }, ], } }, @@ -67,8 +66,7 @@ sub set_counters { key_values => [ { name => 'sessions' }], output_template => 'Active web sessions: %s', perfdatas => [ - { label => 'sessions', value => 'sessions_absolute', template => '%d', - min => 0, unit => 'sessions', label_extra_instance => 1 }, + { label => 'sessions', template => '%d', min => 0, unit => 'sessions', label_extra_instance => 1 }, ], } }, @@ -76,8 +74,7 @@ sub set_counters { key_values => [ { name => 'tunnels' } ], output_template => 'Active Tunnels: %s', perfdatas => [ - { label => 'active_tunnels', value => 'tunnels_absolute', template => '%d', - min => 0, unit => 'tunnels', label_extra_instance => 1 }, + { label => 'active_tunnels', template => '%d', min => 0, unit => 'tunnels', label_extra_instance => 1 }, ], } }, @@ -93,22 +90,20 @@ sub set_counters { } }, { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 1, output_template => 'Traffic In: %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1 }, + { label => 'traffic_in', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 1, output_template => 'Traffic Out: %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1 }, + { label => 'traffic_out', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } } diff --git a/centreon/common/foundry/snmp/mode/cpu.pm b/centreon/common/foundry/snmp/mode/cpu.pm index a778bd133..3c597a1bd 100644 --- a/centreon/common/foundry/snmp/mode/cpu.pm +++ b/centreon/common/foundry/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu_5s' }, { name => 'display' } ], output_template => '%.2f %% (5s)', perfdatas => [ - { value => 'cpu_5s_absolute', template => '%.2f', + { value => 'cpu_5s', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } ] } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'cpu_1m' }, { name => 'display' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { value => 'cpu_1m_absolute', template => '%.2f', + { value => 'cpu_1m', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } ] } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'cpu_5m' }, { name => 'display' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { value => 'cpu_5m_absolute', template => '%.2f', + { value => 'cpu_5m', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } ] } diff --git a/centreon/common/foundry/snmp/mode/memory.pm b/centreon/common/foundry/snmp/mode/memory.pm index 5d3c7c38d..c37842d48 100644 --- a/centreon/common/foundry/snmp/mode/memory.pm +++ b/centreon/common/foundry/snmp/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_usage_output { return sprintf( 'Ram total: %s %s used: %s %s (%.2f%%) free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Ram used: %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' } + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' } ] } } diff --git a/centreon/common/h3c/snmp/mode/cpu.pm b/centreon/common/h3c/snmp/mode/cpu.pm index a29760fb2..27db3c88d 100644 --- a/centreon/common/h3c/snmp/mode/cpu.pm +++ b/centreon/common/h3c/snmp/mode/cpu.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'EntityExtCpuUsage' }, { name => 'num' }, ], output_template => ' : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'EntityExtCpuUsage_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num_absolute' }, + { label => 'cpu', value => 'EntityExtCpuUsage', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num' }, ], } }, diff --git a/centreon/common/ibm/nos/snmp/mode/cpu.pm b/centreon/common/ibm/nos/snmp/mode/cpu.pm index 5260d01e6..6334c9fbb 100644 --- a/centreon/common/ibm/nos/snmp/mode/cpu.pm +++ b/centreon/common/ibm/nos/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'average_1m' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { value => 'average_1m_absolute', template => '%.2f', + { value => 'average_1m', template => '%.2f', min => 0, max => 100, unit => '%' } ] } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'average_5m' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { value => 'average_5m_absolute', template => '%.2f', + { value => 'average_5m', template => '%.2f', min => 0, max => 100, unit => '%' } ] } diff --git a/centreon/common/ibm/nos/snmp/mode/memory.pm b/centreon/common/ibm/nos/snmp/mode/memory.pm index fe9559cbc..5de5cca6e 100644 --- a/centreon/common/ibm/nos/snmp/mode/memory.pm +++ b/centreon/common/ibm/nos/snmp/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_usage_output { return sprintf( 'Ram Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Ram Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' } ] } diff --git a/centreon/common/ingrian/snmp/mode/connections.pm b/centreon/common/ingrian/snmp/mode/connections.pm index 5738bbd17..00ba5ec39 100644 --- a/centreon/common/ingrian/snmp/mode/connections.pm +++ b/centreon/common/ingrian/snmp/mode/connections.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'naeTotalTotalConnections', diff => 1 } ], output_template => 'Total Connections : %s', perfdatas => [ - { label => 'total', value => 'naeTotalTotalConnections_absolute', template => '%s', min => 0 }, + { label => 'total', value => 'naeTotalTotalConnections', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'naeTotalSSLConnections', diff => 1 } ], output_template => 'Total SSL Connections : %s', perfdatas => [ - { label => 'total_ssl', value => 'naeTotalSSLConnections_absolute', template => '%s', min => 0 }, + { label => 'total_ssl', value => 'naeTotalSSLConnections', template => '%s', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'naeTotalNonSSLConnections', diff => 1 } ], output_template => 'Total non-SSL Connections : %s', perfdatas => [ - { label => 'total_non_ssl', value => 'naeTotalNonSSLConnections_absolute', template => '%s', min => 0 }, + { label => 'total_non_ssl', value => 'naeTotalNonSSLConnections', template => '%s', min => 0 }, ], } }, diff --git a/centreon/common/ingrian/snmp/mode/cpu.pm b/centreon/common/ingrian/snmp/mode/cpu.pm index 83e440ea3..b8339dd71 100644 --- a/centreon/common/ingrian/snmp/mode/cpu.pm +++ b/centreon/common/ingrian/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total CPU Usage : %.2f %%', perfdatas => [ - { label => 'total_cpu_avg', value => 'total_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'total_cpu_avg', value => 'total', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => 'usage' }, { name => 'display' }, ], output_template => 'Usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'usage_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'usage', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/ingrian/snmp/mode/disk.pm b/centreon/common/ingrian/snmp/mode/disk.pm index 21b6b6a87..6bbfb8a5e 100644 --- a/centreon/common/ingrian/snmp/mode/disk.pm +++ b/centreon/common/ingrian/snmp/mode/disk.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'display' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%.2f', min => 0, max => 100, unit => '%', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/ingrian/snmp/mode/requeststats.pm b/centreon/common/ingrian/snmp/mode/requeststats.pm index 0d26f4ab2..d31fa51fc 100644 --- a/centreon/common/ingrian/snmp/mode/requeststats.pm +++ b/centreon/common/ingrian/snmp/mode/requeststats.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'success', diff => 1 }, { name => 'display' } ], output_template => 'Success : %s', perfdatas => [ - { label => 'success', value => 'success_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'success', value => 'success', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'fail', diff => 1 }, { name => 'display' } ], output_template => 'Fail : %s', perfdatas => [ - { label => 'fail', value => 'fail_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'fail', value => 'fail', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/jvm/mode/classcount.pm b/centreon/common/jvm/mode/classcount.pm index 8a7b9e2c8..94db98b53 100644 --- a/centreon/common/jvm/mode/classcount.pm +++ b/centreon/common/jvm/mode/classcount.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'LoadedClassCount' } ], output_template => 'Current : %s', perfdatas => [ - { label => 'current', value => 'LoadedClassCount_absolute', template => '%s', min => 0 }, + { label => 'current', value => 'LoadedClassCount', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'TotalLoadedClassCount', diff => 1 } ], output_template => 'Loaded : %s', perfdatas => [ - { label => 'loaded', value => 'TotalLoadedClassCount_absolute', template => '%s', min => 0 }, + { label => 'loaded', value => 'TotalLoadedClassCount', template => '%s', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'UnloadedClassCount', diff => 1 } ], output_template => 'Unloaded : %s', perfdatas => [ - { label => 'unloaded', value => 'UnloadedClassCount_absolute', template => '%s', min => 0 }, + { label => 'unloaded', value => 'UnloadedClassCount', template => '%s', min => 0 }, ], } }, diff --git a/centreon/common/jvm/mode/gcusage.pm b/centreon/common/jvm/mode/gcusage.pm index 439a698c2..1c60aa1db 100644 --- a/centreon/common/jvm/mode/gcusage.pm +++ b/centreon/common/jvm/mode/gcusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'time', diff => 1 }, { name => 'display' } ], output_template => 'Collection Time : %s ms', perfdatas => [ - { label => 'time', value => 'time_absolute', template => '%s', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'time', value => 'time', template => '%s', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'count', diff => 1 }, { name => 'display' } ], output_template => 'Collection Count : %s', perfdatas => [ - { label => 'count', value => 'count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'count', value => 'count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/centreon/common/jvm/mode/threads.pm b/centreon/common/jvm/mode/threads.pm index 0ab3d741d..fa71c5588 100644 --- a/centreon/common/jvm/mode/threads.pm +++ b/centreon/common/jvm/mode/threads.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'ThreadCount' } ], output_template => 'Active : %s', perfdatas => [ - { label => 'active', value => 'ThreadCount_absolute', template => '%s', min => 0 }, + { label => 'active', value => 'ThreadCount', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'TotalStartedThreadCount', diff => 1 } ], output_template => 'Started : %s', perfdatas => [ - { label => 'started', value => 'TotalStartedThreadCount_absolute', template => '%s', min => 0 }, + { label => 'started', value => 'TotalStartedThreadCount', template => '%s', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'DaemonThreadCount' } ], output_template => 'Daemon : %s', perfdatas => [ - { label => 'daemon', value => 'DaemonThreadCount_absolute', template => '%s', min => 0 }, + { label => 'daemon', value => 'DaemonThreadCount', template => '%s', min => 0 }, ], } }, diff --git a/centreon/common/microsoft/skype/mssql/mode/appsharingqoe.pm b/centreon/common/microsoft/skype/mssql/mode/appsharingqoe.pm index 319db514c..d1931c907 100644 --- a/centreon/common/microsoft/skype/mssql/mode/appsharingqoe.pm +++ b/centreon/common/microsoft/skype/mssql/mode/appsharingqoe.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'SpoiledTilePercentTotal' } ], output_template => 'Average Spoiled Tiles: %.2f%%', perfdatas => [ - { label => 'spoiled_tile_prct_total_avg', value => 'SpoiledTilePercentTotal_absolute', + { label => 'spoiled_tile_prct_total_avg', value => 'SpoiledTilePercentTotal', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'RDPTileProcessingLatencyAverage' } ], output_template => 'Average RDP Tiles Processing Latency: %.2f ms', perfdatas => [ - { label => 'rdp_tile_processing_latency_avg', value => 'RDPTileProcessingLatencyAverage_absolute', + { label => 'rdp_tile_processing_latency_avg', value => 'RDPTileProcessingLatencyAverage', template => '%.2f', unit => 'ms', min => 0 }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'RelativeOneWayAverage' } ], output_template => 'Average Amount of One-way Latency: %.2f ms', perfdatas => [ - { label => 'relative_one_way_average', value => 'RelativeOneWayAverage_absolute', + { label => 'relative_one_way_average', value => 'RelativeOneWayAverage', template => '%.2f', unit => 'ms', min => 0 }, ], } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'TotalStreams' } ], output_template => 'Streams Count: %.2f/s', perfdatas => [ - { label => 'stream_count', value => 'TotalStreams_absolute', template => '%.2f', + { label => 'stream_count', value => 'TotalStreams', template => '%.2f', unit => 'streams/s', min => 0 }, ], } diff --git a/centreon/common/microsoft/skype/mssql/mode/audioqoe.pm b/centreon/common/microsoft/skype/mssql/mode/audioqoe.pm index e95143910..05e8217df 100644 --- a/centreon/common/microsoft/skype/mssql/mode/audioqoe.pm +++ b/centreon/common/microsoft/skype/mssql/mode/audioqoe.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'JitterAvg' } ], output_template => 'Average: %d ms', perfdatas => [ - { label => 'jitter_avg', value => 'JitterAvg_absolute', template => '%d', + { label => 'jitter_avg', value => 'JitterAvg', template => '%d', unit => 'ms', min => 0 }, ], } @@ -48,7 +48,7 @@ sub set_counters { key_values => [ { name => 'JitterMin' } ], output_template => 'Min: %d ms', perfdatas => [ - { label => 'jitter_min', value => 'JitterMin_absolute', template => '%d', + { label => 'jitter_min', value => 'JitterMin', template => '%d', unit => 'ms', min => 0 }, ], } @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'JitterMax' } ], output_template => 'Max: %d ms', perfdatas => [ - { label => 'jitter_max', value => 'JitterMax_absolute', template => '%d', + { label => 'jitter_max', value => 'JitterMax', template => '%d', unit => 'ms', min => 0 }, ], } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'PacketLossAvg' } ], output_template => 'Average: %.2f%%', perfdatas => [ - { label => 'pckt_loss_avg', value => 'PacketLossAvg_absolute', template => '%.2f', + { label => 'pckt_loss_avg', value => 'PacketLossAvg', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'PacketLossMin' } ], output_template => 'Min: %.2f%%', perfdatas => [ - { label => 'pckt_loss_min', value => 'PacketLossMin_absolute', template => '%.2f', + { label => 'pckt_loss_min', value => 'PacketLossMin', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'PacketLossMax' } ], output_template => 'Max: %.2f%%', perfdatas => [ - { label => 'pckt_loss_max', value => 'PacketLossMax_absolute', template => '%.2f', + { label => 'pckt_loss_max', value => 'PacketLossMax', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => 'TotalStreams' } ], output_template => 'Streams Count: %.2f/s', perfdatas => [ - { label => 'stream_count', value => 'TotalStreams_absolute', template => '%.2f', + { label => 'stream_count', value => 'TotalStreams', template => '%.2f', unit => 'streams/s', min => 0 }, ], } diff --git a/centreon/common/microsoft/skype/mssql/mode/poorcalls.pm b/centreon/common/microsoft/skype/mssql/mode/poorcalls.pm index 030e81043..620e49104 100644 --- a/centreon/common/microsoft/skype/mssql/mode/poorcalls.pm +++ b/centreon/common/microsoft/skype/mssql/mode/poorcalls.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Poor Calls: %d', perfdatas => [ - { label => 'poor_calls', value => 'count_absolute', template => '%d', + { label => 'poor_calls', value => 'count', template => '%d', unit => 'calls', min => 0 }, ], } diff --git a/centreon/common/microsoft/skype/mssql/mode/sessionstypes.pm b/centreon/common/microsoft/skype/mssql/mode/sessionstypes.pm index 94626c5ea..5fc7dc4f2 100644 --- a/centreon/common/microsoft/skype/mssql/mode/sessionstypes.pm +++ b/centreon/common/microsoft/skype/mssql/mode/sessionstypes.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'instant_messaging' } ], output_template => 'Instant Messaging: %d', perfdatas => [ - { label => 'instant_messaging', value => 'instant_messaging_absolute', template => '%d', + { label => 'instant_messaging', value => 'instant_messaging', template => '%d', unit => 'sessions', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'audio' } ], output_template => 'Audio: %d', perfdatas => [ - { label => 'audio', value => 'audio_absolute', template => '%d', + { label => 'audio', value => 'audio', template => '%d', unit => 'sessions', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'video' } ], output_template => 'Video: %d', perfdatas => [ - { label => 'video', value => 'video_absolute', template => '%d', + { label => 'video', value => 'video', template => '%d', unit => 'sessions', min => 0 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'file_transfer' } ], output_template => 'File Transfer: %d', perfdatas => [ - { label => 'file_transfer', value => 'file_transfer_absolute', template => '%d', + { label => 'file_transfer', value => 'file_transfer', template => '%d', unit => 'sessions', min => 0 }, ], } @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => 'remote_assistance' } ], output_template => 'Remote Assistance: %d', perfdatas => [ - { label => 'remote_assistance', value => 'remote_assistance_absolute', template => '%d', + { label => 'remote_assistance', value => 'remote_assistance', template => '%d', unit => 'sessions', min => 0 }, ], } @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => 'app_sharing' } ], output_template => 'App Sharing: %d', perfdatas => [ - { label => 'app_sharing', value => 'app_sharing_absolute', template => '%d', + { label => 'app_sharing', value => 'app_sharing', template => '%d', unit => 'sessions', min => 0 }, ], } @@ -91,7 +91,7 @@ sub set_counters { key_values => [ { name => 'app_invite' } ], output_template => 'App Invite: %d', perfdatas => [ - { label => 'app_invite', value => 'app_invite_absolute', template => '%d', + { label => 'app_invite', value => 'app_invite', template => '%d', unit => 'sessions', min => 0 }, ], } diff --git a/centreon/common/microsoft/skype/mssql/mode/videoqoe.pm b/centreon/common/microsoft/skype/mssql/mode/videoqoe.pm index ced1a2bbd..3c1b35dee 100644 --- a/centreon/common/microsoft/skype/mssql/mode/videoqoe.pm +++ b/centreon/common/microsoft/skype/mssql/mode/videoqoe.pm @@ -18,7 +18,7 @@ sub set_counters { key_values => [ { name => 'VideoPacketLossRate' } ], output_template => 'Packet Loss Rate: %.2f%%', perfdatas => [ - { label => 'video_pckt_loss_rate', value => 'VideoPacketLossRate_absolute', + { label => 'video_pckt_loss_rate', value => 'VideoPacketLossRate', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -27,7 +27,7 @@ sub set_counters { key_values => [ { name => 'VideoPostFECPLR' } ], output_template => 'Packet Loss Rate After Correction: %.2f%%', perfdatas => [ - { label => 'video_post_fecplr', value => 'VideoPostFECPLR_absolute', + { label => 'video_post_fecplr', value => 'VideoPostFECPLR', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'VideoLocalFrameLossPercentageAvg' } ], output_template => 'Video Frame Loss: %.2f%%', perfdatas => [ - { label => 'video_frame_loss_prct_avg', value => 'VideoLocalFrameLossPercentageAvg_absolute', + { label => 'video_frame_loss_prct_avg', value => 'VideoLocalFrameLossPercentageAvg', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'RecvFrameRateAverage' } ], output_template => 'Receiver Frame Rate: %.2f/s', perfdatas => [ - { label => 'rcv_frame_rate_avg', value => 'RecvFrameRateAverage_absolute', + { label => 'rcv_frame_rate_avg', value => 'RecvFrameRateAverage', template => '%.2f', unit => 'frames/s', min => 0 }, ], } @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'InboundVideoFrameRateAvg' } ], output_template => 'Inbound Video Frame Rate: %.2f%%', perfdatas => [ - { label => 'inbound_video_frame_rate_avg', value => 'InboundVideoFrameRateAvg_absolute', + { label => 'inbound_video_frame_rate_avg', value => 'InboundVideoFrameRateAvg', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'OutboundVideoFrameRateAvg' } ], output_template => 'Outbound Video Frame Rate: %.2f%%', perfdatas => [ - { label => 'outbound_video_frame_rate_avg', value => 'OutboundVideoFrameRateAvg_absolute', + { label => 'outbound_video_frame_rate_avg', value => 'OutboundVideoFrameRateAvg', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'TotalStreams' } ], output_template => 'Streams Count: %.2f/s', perfdatas => [ - { label => 'stream_count', value => 'TotalStreams_absolute', template => '%.2f', + { label => 'stream_count', value => 'TotalStreams', template => '%.2f', unit => 'streams/s', min => 0 }, ], } diff --git a/centreon/common/polycom/endpoint/snmp/mode/videoconferencing.pm b/centreon/common/polycom/endpoint/snmp/mode/videoconferencing.pm index 92eeb6298..06af0c25c 100644 --- a/centreon/common/polycom/endpoint/snmp/mode/videoconferencing.pm +++ b/centreon/common/polycom/endpoint/snmp/mode/videoconferencing.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'NumberActiveConferences' } ], output_template => 'Current Conferences : %s', perfdatas => [ - { label => 'conferences_active', value => 'NumberActiveConferences_absolute', template => '%d', min => 0 }, + { label => 'conferences_active', value => 'NumberActiveConferences', template => '%d', min => 0 }, ], } }, diff --git a/centreon/common/radlan/snmp/mode/cpu.pm b/centreon/common/radlan/snmp/mode/cpu.pm index b30a23b0f..6865682d7 100644 --- a/centreon/common/radlan/snmp/mode/cpu.pm +++ b/centreon/common/radlan/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'average_1s' } ], output_template => '%.2f %% (1s)', perfdatas => [ - { value => 'average_1s_absolute', template => '%.2f', + { value => 'average_1s', template => '%.2f', min => 0, max => 100, unit => '%' } ] } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'average_1m' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { value => 'average_1m_absolute', template => '%.2f', + { value => 'average_1m', template => '%.2f', min => 0, max => 100, unit => '%' } ] } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'average_5m' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { value => 'average_5m_absolute', template => '%.2f', + { value => 'average_5m', template => '%.2f', min => 0, max => 100, unit => '%' } ] } diff --git a/centreon/common/riverbed/steelhead/snmp/mode/bwoptimization.pm b/centreon/common/riverbed/steelhead/snmp/mode/bwoptimization.pm index 194d27d56..ff87dc10d 100644 --- a/centreon/common/riverbed/steelhead/snmp/mode/bwoptimization.pm +++ b/centreon/common/riverbed/steelhead/snmp/mode/bwoptimization.pm @@ -35,42 +35,38 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'wan2lan-lan', set => { - key_values => [ { name => 'bwHCAggInLan', diff => 1 } ], + key_values => [ { name => 'bwHCAggInLan', per_second => 1 } ], output_template => 'Wan2Lan on Lan: %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'wan2lan_lan', value => 'bwHCAggInLan_per_second', - template => '%s', min => 0, unit => 'B/s' }, + { label => 'wan2lan_lan', template => '%s', min => 0, unit => 'B/s' }, ], } }, { label => 'wan2lan-wan', set => { - key_values => [ { name => 'bwHCAggInWan', diff => 1 } ], + key_values => [ { name => 'bwHCAggInWan', per_second => 1 } ], output_template => 'Wan2Lan on Wan: %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'wan2lan_wan', value => 'bwHCAggInWan_per_second', - template => '%s', min => 0, unit => 'B/s' }, + { label => 'wan2lan_wan', template => '%s', min => 0, unit => 'B/s' }, ], } }, { label => 'lan2wan-lan', set => { - key_values => [ { name => 'bwHCAggOutLan', diff => 1 } ], + key_values => [ { name => 'bwHCAggOutLan', per_second => 1 } ], output_template => 'Lan2Wan on Lan: %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'lan2wan_lan', value => 'bwHCAggOutLan_per_second', - template => '%s', min => 0, unit => 'B/s' }, + { label => 'lan2wan_lan', template => '%s', min => 0, unit => 'B/s' }, ], } }, { label => 'lan2wan-wan', set => { - key_values => [ { name => 'bwHCAggOutWan', diff => 1 } ], + key_values => [ { name => 'bwHCAggOutWan', per_second => 1 } ], output_template => 'Lan2Wan on Wan: %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'lan2wan_wan', value => 'bwHCAggOutWan_per_second', - template => '%s', min => 0, unit => 'B/s' }, + { label => 'lan2wan_wan', template => '%s', min => 0, unit => 'B/s' }, ], } }, diff --git a/centreon/common/riverbed/steelhead/snmp/mode/bwpassthrough.pm b/centreon/common/riverbed/steelhead/snmp/mode/bwpassthrough.pm index 4ff04e356..424ed7a8c 100644 --- a/centreon/common/riverbed/steelhead/snmp/mode/bwpassthrough.pm +++ b/centreon/common/riverbed/steelhead/snmp/mode/bwpassthrough.pm @@ -35,22 +35,20 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'bwPassThroughIn', diff => 1 } ], + key_values => [ { name => 'bwPassThroughIn', per_second => 1 } ], output_template => 'Traffic In (Wan2Lan): %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'traffic_in', value => 'bwPassThroughIn_per_second', - template => '%s', min => 0, unit => 'B/s' }, + { label => 'traffic_in', template => '%s', min => 0, unit => 'B/s' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'bwPassThroughOut', diff => 1 } ], + key_values => [ { name => 'bwPassThroughOut', per_second => 1 } ], output_template => 'Traffic Out (Lan2Wan): %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'traffic_out', value => 'bwPassThroughOut_per_second', - template => '%s', min => 0, unit => 'B/s' }, + { label => 'traffic_out', template => '%s', min => 0, unit => 'B/s' }, ], } }, diff --git a/centreon/common/riverbed/steelhead/snmp/mode/connections.pm b/centreon/common/riverbed/steelhead/snmp/mode/connections.pm index 3237c52c4..cfb892b4f 100644 --- a/centreon/common/riverbed/steelhead/snmp/mode/connections.pm +++ b/centreon/common/riverbed/steelhead/snmp/mode/connections.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'totalConnections' } ], output_template => 'total %s', perfdatas => [ - { label => 'total', value => 'totalConnections_absolute', template => '%s', min => 0 }, + { label => 'total', value => 'totalConnections', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'establishedConnections' } ], output_template => 'established %s', perfdatas => [ - { label => 'established', value => 'establishedConnections_absolute', template => '%s', min => 0 }, + { label => 'established', value => 'establishedConnections', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'activeConnections' } ], output_template => 'active %s', perfdatas => [ - { label => 'active', value => 'activeConnections_absolute', template => '%s', min => 0 }, + { label => 'active', value => 'activeConnections', template => '%s', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'optimizedConnections' } ], output_template => 'optimized %s', perfdatas => [ - { label => 'optimized', value => 'optimizedConnections_absolute', template => '%s', min => 0 }, + { label => 'optimized', value => 'optimizedConnections', template => '%s', min => 0 }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'passthroughConnections' } ], output_template => 'passthrough %s', perfdatas => [ - { label => 'passthrough', value => 'passthroughConnections_absolute', template => '%s', min => 0 }, + { label => 'passthrough', value => 'passthroughConnections', template => '%s', min => 0 }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'halfOpenedConnections' } ], output_template => 'half opened %s', perfdatas => [ - { label => 'half_opened', value => 'halfOpenedConnections_absolute', template => '%s', min => 0 }, + { label => 'half_opened', value => 'halfOpenedConnections', template => '%s', min => 0 }, ], } }, @@ -85,7 +85,7 @@ sub set_counters { key_values => [ { name => 'halfClosedConnections' } ], output_template => 'half closed %s', perfdatas => [ - { label => 'half_closed', value => 'halfClosedConnections_absolute', template => '%s', min => 0 }, + { label => 'half_closed', value => 'halfClosedConnections', template => '%s', min => 0 }, ], } }, diff --git a/centreon/common/riverbed/steelhead/snmp/mode/diskutilization.pm b/centreon/common/riverbed/steelhead/snmp/mode/diskutilization.pm index 0d5255ea4..3a32b4b1b 100644 --- a/centreon/common/riverbed/steelhead/snmp/mode/diskutilization.pm +++ b/centreon/common/riverbed/steelhead/snmp/mode/diskutilization.pm @@ -38,28 +38,23 @@ sub set_counters { key_values => [ { name => 'dsAveDiskUtilization' } ], output_template => 'Datastore Usage: %.2f%%', perfdatas => [ - { label => 'used', value => 'dsAveDiskUtilization_absolute', template => '%.2f', - min => 0, max => 100, unit => '%' }, + { label => 'used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, { label => 'hits', set => { - key_values => [ { name => 'dsHitsTotal', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'dsHitsTotal', per_second => 1 } ], output_template => 'Hits: %s/s', perfdatas => [ - { label => 'hits', value => 'dsHitsTotal_per_second', template => '%.2f', - min => 0, unit => 'hits/s' }, + { label => 'hits', template => '%.2f', min => 0, unit => 'hits/s' }, ], } }, { label => 'misses', set => { - key_values => [ { name => 'dsMissTotal', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'dsMissTotal', per_second => 1 } ], output_template => 'Misses: %s/s', perfdatas => [ - { label => 'misses', value => 'dsMissTotal_per_second', template => '%.2f', - min => 0, unit => 'misses/s' }, + { label => 'misses', template => '%.2f', min => 0, unit => 'misses/s' }, ], } }, @@ -73,6 +68,7 @@ sub new { $options{options}->add_options(arguments =>{ }); + return $self; } diff --git a/centreon/common/riverbed/steelhead/snmp/mode/loadaverage.pm b/centreon/common/riverbed/steelhead/snmp/mode/loadaverage.pm index d51d9b5c1..29705ac3c 100644 --- a/centreon/common/riverbed/steelhead/snmp/mode/loadaverage.pm +++ b/centreon/common/riverbed/steelhead/snmp/mode/loadaverage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpuUtil1' } ], output_template => 'CPU Average: %.2f%%', perfdatas => [ - { label => 'total_cpu_avg', value => 'cpuUtil1_absolute', template => '%.2f', + { label => 'total_cpu_avg', value => 'cpuUtil1', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'cpuLoad1' } ], output_template => 'Load 1 min: %.2f', perfdatas => [ - { label => 'load1', value => 'cpuLoad1_absolute', template => '%.2f', + { label => 'load1', value => 'cpuLoad1', template => '%.2f', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'cpuLoad5' } ], output_template => 'Load 5 min: %.2f', perfdatas => [ - { label => 'load5', value => 'cpuLoad5_absolute', template => '%.2f', + { label => 'load5', value => 'cpuLoad5', template => '%.2f', min => 0 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'cpuLoad15' } ], output_template => 'Load 15 min: %.2f', perfdatas => [ - { label => 'load15', value => 'cpuLoad15_absolute', template => '%.2f', + { label => 'load15', value => 'cpuLoad15', template => '%.2f', min => 0 }, ], } diff --git a/centreon/common/riverbed/steelhead/snmp/mode/status.pm b/centreon/common/riverbed/steelhead/snmp/mode/status.pm index b1d814566..737b1abe5 100644 --- a/centreon/common/riverbed/steelhead/snmp/mode/status.pm +++ b/centreon/common/riverbed/steelhead/snmp/mode/status.pm @@ -60,9 +60,9 @@ sub set_counters { }, { label => 'uptime', set => { key_values => [ { name => 'serviceUptime' }, { name => 'serviceUptime_human' } ], - output_template => 'Uptime: %s', output_use => 'serviceUptime_human_absolute', + output_template => 'Uptime: %s', output_use => 'serviceUptime_human', perfdatas => [ - { label => 'uptime', value => 'serviceUptime_absolute', template => '%d', + { label => 'uptime', value => 'serviceUptime', template => '%d', min => 0, unit => 's' }, ], } diff --git a/centreon/common/riverbed/steelhead/snmp/mode/temperature.pm b/centreon/common/riverbed/steelhead/snmp/mode/temperature.pm index 8f74b4366..59a53a0b5 100644 --- a/centreon/common/riverbed/steelhead/snmp/mode/temperature.pm +++ b/centreon/common/riverbed/steelhead/snmp/mode/temperature.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'systemTemperature' } ], output_template => 'Temperature: %.2f C', perfdatas => [ - { label => 'temperature', value => 'systemTemperature_absolute', template => '%.2f', + { label => 'temperature', value => 'systemTemperature', template => '%.2f', min => 0, unit => 'C' }, ], } diff --git a/centreon/common/xppc/snmp/mode/batterystatus.pm b/centreon/common/xppc/snmp/mode/batterystatus.pm index 056a9a33d..3b3c25e53 100644 --- a/centreon/common/xppc/snmp/mode/batterystatus.pm +++ b/centreon/common/xppc/snmp/mode/batterystatus.pm @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'upsSmartBatteryCapacity' } ], output_template => 'remaining capacity: %s %%', perfdatas => [ - { value => 'upsSmartBatteryCapacity_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { value => 'upsSmartBatteryCapacity', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'upsSmartBatteryRunTimeRemaining' } ], output_template => 'remaining time: %s minutes', perfdatas => [ - { value => 'upsSmartBatteryRunTimeRemaining_absolute', template => '%s', min => 0, unit => 'm' }, + { value => 'upsSmartBatteryRunTimeRemaining', template => '%s', min => 0, unit => 'm' }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'upsSmartBatteryVoltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'upsSmartBatteryVoltage_absolute', template => '%s', unit => 'V' }, + { value => 'upsSmartBatteryVoltage', template => '%s', unit => 'V' }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'upsSmartBatteryTemperature', no_value => 0 } ], output_template => 'temperature: %s C', perfdatas => [ - { value => 'upsSmartBatteryTemperature_absolute', template => '%s', unit => 'C' }, + { value => 'upsSmartBatteryTemperature', template => '%s', unit => 'C' }, ], } }, diff --git a/centreon/common/xppc/snmp/mode/environment.pm b/centreon/common/xppc/snmp/mode/environment.pm index ec41ff317..ec5a969dc 100644 --- a/centreon/common/xppc/snmp/mode/environment.pm +++ b/centreon/common/xppc/snmp/mode/environment.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'internal_temperature' } ], output_template => 'internal temperature: %.2f C', perfdatas => [ - { value => 'internal_temperature_absolute', template => '%.2f', + { value => 'internal_temperature', template => '%.2f', min => 0, unit => 'C' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'internal_humidity' } ], output_template => 'internal humidity: %.2f %%', perfdatas => [ - { value => 'internal_humidity_absolute', template => '%.2f', + { value => 'internal_humidity', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'remote_temperature' } ], output_template => 'remote temperature: %.2f C', perfdatas => [ - { value => 'remote_temperature_absolute', template => '%.2f', + { value => 'remote_temperature', template => '%.2f', min => 0, unit => 'C' }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'remote_humidity' } ], output_template => 'remote humidity: %.2f %%', perfdatas => [ - { value => 'remote_humidity_absolute', template => '%.2f', + { value => 'remote_humidity', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/centreon/common/xppc/snmp/mode/inputlines.pm b/centreon/common/xppc/snmp/mode/inputlines.pm index b8e8dbeb7..16c190f22 100644 --- a/centreon/common/xppc/snmp/mode/inputlines.pm +++ b/centreon/common/xppc/snmp/mode/inputlines.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'upsSmartInputFrequency', no_value => 0 } ], output_template => 'frequence: %.2f Hz', perfdatas => [ - { value => 'upsSmartInputFrequency_absolute', template => '%.2f', + { value => 'upsSmartInputFrequency', template => '%.2f', unit => 'Hz' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'upsSmartInputLineVoltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'upsSmartInputLineVoltage_absolute', template => '%s', + { value => 'upsSmartInputLineVoltage', template => '%s', unit => 'V' }, ], } diff --git a/centreon/common/xppc/snmp/mode/outputlines.pm b/centreon/common/xppc/snmp/mode/outputlines.pm index cea42be3b..df2f3d321 100644 --- a/centreon/common/xppc/snmp/mode/outputlines.pm +++ b/centreon/common/xppc/snmp/mode/outputlines.pm @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'upsSmartOutputLoad', no_value => -1 } ], output_template => 'load: %.2f %%', perfdatas => [ - { value => 'upsSmartOutputLoad_absolute', template => '%.2f', min => 0, max => 100 }, + { value => 'upsSmartOutputLoad', template => '%.2f', min => 0, max => 100 }, ], } }, @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'upsSmartOutputFrequency', no_value => 0 } ], output_template => 'frequence: %.2f Hz', perfdatas => [ - { value => 'upsSmartOutputFrequency_absolute', template => '%.2f', unit => 'Hz' }, + { value => 'upsSmartOutputFrequency', template => '%.2f', unit => 'Hz' }, ], } }, @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'upsSmartOutputVoltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'upsSmartOutputVoltage_absolute', template => '%s', + { value => 'upsSmartOutputVoltage', template => '%s', unit => 'V' }, ], } diff --git a/centreon/plugins/templates/counter.pm b/centreon/plugins/templates/counter.pm index 4ab923489..e0951f33d 100644 --- a/centreon/plugins/templates/counter.pm +++ b/centreon/plugins/templates/counter.pm @@ -52,7 +52,7 @@ sub set_counters { # key_values => [ { name => 'client' } ], # output_template => 'Current client connections : %s', # perfdatas => [ - # { label => 'Client', value => 'client_absolute', template => '%s', + # { label => 'Client', value => 'client', template => '%s', # min => 0, unit => 'con' }, # ], # } @@ -332,8 +332,10 @@ sub run_instances { $no_message_multiple = 0; $obj->set(instance => $id); - my ($value_check) = $obj->execute(new_datas => $self->{new_datas}, - values => $self->{$options{config}->{name}}->{$id}); + my ($value_check) = $obj->execute( + new_datas => $self->{new_datas}, + values => $self->{$options{config}->{name}}->{$id} + ); next if (defined($options{config}->{skipped_code}) && defined($options{config}->{skipped_code}->{$value_check})); if ($value_check != 0) { $long_msg .= $long_msg_append . $obj->output_error(); @@ -382,8 +384,10 @@ sub run_instances { } if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) { - $self->{output}->output_add(severity => $exit, - short_msg => $prefix_output . $short_msg . $suffix_output); + $self->{output}->output_add( + severity => $exit, + short_msg => $prefix_output . $short_msg . $suffix_output + ); } if ($self->{multiple} == 0) { @@ -648,7 +652,7 @@ sub run { $self->{statefile_value}->read(statefile => $self->{cache_name}) if (defined($self->{cache_name})); $self->{new_datas}->{last_timestamp} = time(); } - + foreach my $entry (@{$self->{maps_counters_type}}) { if ($entry->{type} == 0) { $self->run_global(config => $entry); diff --git a/centreon/plugins/values.pm b/centreon/plugins/values.pm index 33d9c7826..5e9794725 100644 --- a/centreon/plugins/values.pm +++ b/centreon/plugins/values.pm @@ -43,8 +43,6 @@ sub new { $self->{output_template} = $self->{label} . ' : %s'; $self->{output_use} = undef; $self->{output_change_bytes} = 0; - $self->{output_absolute_unit} = ''; - $self->{output_per_second_unit} = ''; $self->{output_error_template} = $self->{label} . ' : %s'; @@ -89,14 +87,12 @@ sub calc { # manage only one value ;) foreach my $value (@{$self->{key_values}}) { - if (defined($value->{diff}) && $value->{diff} == 1) { - if (defined($self->{per_second}) && $self->{per_second} == 1) { - $self->{result_values}->{$value->{name} . '_per_second'} = ($options{new_datas}->{$self->{instance} . '_' . $value->{name}} - $options{old_datas}->{$self->{instance} . '_' . $value->{name}}) / $options{delta_time}; - } - $self->{result_values}->{$value->{name} . '_absolute'} = $options{new_datas}->{$self->{instance} . '_' . $value->{name}} - $options{old_datas}->{$self->{instance} . '_' . $value->{name}}; + if (defined($value->{per_second}) && $value->{per_second} == 1) { + $self->{result_values}->{$value->{name}} = ($options{new_datas}->{$self->{instance} . '_' . $value->{name}} - $options{old_datas}->{$self->{instance} . '_' . $value->{name}}) / $options{delta_time}; + } elsif (defined($value->{diff}) && $value->{diff} == 1) { + $self->{result_values}->{$value->{name}} = $options{new_datas}->{$self->{instance} . '_' . $value->{name}} - $options{old_datas}->{$self->{instance} . '_' . $value->{name}}; } else { - # absolute one. nothing to do. Can be used for values. - $self->{result_values}->{$value->{name} . '_absolute'} = $options{new_datas}->{$self->{instance} . '_' . $value->{name}}; + $self->{result_values}->{$value->{name}} = $options{new_datas}->{$self->{instance} . '_' . $value->{name}}; } } @@ -113,25 +109,24 @@ sub threshold_check { my $warn = defined($self->{threshold_warn}) ? $self->{threshold_warn} : 'warning-' . $self->{thlabel}; my $crit = defined($self->{threshold_crit}) ? $self->{threshold_crit} : 'critical-' . $self->{thlabel}; - my $first = defined($self->{key_values}->[0]) ? $self->{key_values}->[0]->{name} : ''; - my $value; - - if (!defined($self->{threshold_use})) { - $value = $self->{result_values}->{$first . '_absolute'}; - if (defined($self->{per_second}) && $self->{per_second} == 1) { - $value = $self->{result_values}->{$first . '_per_second'}; - } + my $value = ''; + if (defined($self->{threshold_use})) { + $value = $self->{result_values}->{ $self->{threshold_use} }; } else { - $value = $self->{result_values}->{$self->{threshold_use}}; + $value = defined($self->{key_values}->[0]) ? $self->{key_values}->[0]->{name} : ''; } - return $self->{perfdata}->threshold_check(value => $value, threshold => [ { label => $crit, 'exit_litteral' => 'critical' }, - { label => $warn, 'exit_litteral' => 'warning' }]); + return $self->{perfdata}->threshold_check( + value => $value, threshold => [ + { label => $crit, exit_litteral => 'critical' }, + { label => $warn, exit_litteral => 'warning' } + ] + ); } sub output_error { my ($self, %options) = @_; - + return sprintf($self->{output_error_template}, $self->{error_msg}); } @@ -141,24 +136,23 @@ sub output { if (defined($self->{closure_custom_output})) { return $self->{closure_custom_output}->($self); } - my $first = defined($self->{key_values}->[0]) ? $self->{key_values}->[0]->{name} : undef; - my ($value, $unit) = (defined($first) ? $self->{result_values}->{$first . '_absolute'} : '', $self->{output_absolute_unit}); - - if (!defined($self->{output_use})) { - if ($self->{per_second} == 1) { - $value = $self->{result_values}->{$first . '_per_second'}; - $unit = $self->{output_per_second_unit}; - } + + my ($value, $unit, $name) = ('', ''); + if (defined($self->{output_use})) { + $name = $self->{output_use}; } else { - $value = $self->{result_values}->{$self->{output_use}}; + $name = defined($self->{key_values}->[0]) ? $self->{key_values}->[0]->{name} : undef; } - if ($self->{output_change_bytes} == 1) { - ($value, $unit) = $self->{perfdata}->change_bytes(value => $value); - } elsif ($self->{output_change_bytes} == 2) { - ($value, $unit) = $self->{perfdata}->change_bytes(value => $value, network => 1); + if (defined($name)) { + $value = $self->{result_values}->{$name}; + if ($self->{output_change_bytes} == 1) { + ($value, $unit) = $self->{perfdata}->change_bytes(value => $value); + } elsif ($self->{output_change_bytes} == 2) { + ($value, $unit) = $self->{perfdata}->change_bytes(value => $value, network => 1); + } } - + return sprintf($self->{output_template}, $value, $unit); } @@ -213,15 +207,17 @@ sub perfdata { } } + my $value = defined($perf->{value}) ? $perf->{value} : $self->{key_values}->[0]->{name}; $self->{output}->perfdata_add( label => $label, instances => $instances, nlabel => $self->{nlabel}, unit => $perf->{unit}, - value => $cast_int == 1 ? int($self->{result_values}->{$perf->{value}}) : sprintf($template, $self->{result_values}->{$perf->{value}}), + value => $cast_int == 1 ? int($self->{result_values}->{$value}) : sprintf($template, $self->{result_values}->{$value}), warning => $self->{perfdata}->get_perfdata_for_output(label => $warn, total => $th_total, cast_int => $cast_int), critical => $self->{perfdata}->get_perfdata_for_output(label => $crit, total => $th_total, cast_int => $cast_int), - min => $min, max => $max + min => $min, + max => $max ); } } @@ -233,7 +229,6 @@ sub execute { $self->{result_values} = {}, $self->{error_msg} = undef; my $quit = 0; - my $per_second = 0; $options{new_datas} = {} if (!defined($options{new_datas})); foreach my $value (@{$self->{key_values}}) { @@ -243,7 +238,8 @@ sub execute { last; } - if (defined($value->{diff}) && $value->{diff} == 1) { + if ((defined($value->{diff}) && $value->{diff} == 1) || + (defined($value->{per_second}) && $value->{per_second} == 1)) { $options{new_datas}->{$self->{instance} . '_' . $value->{name}} = $options{values}->{$value->{name}}; $old_datas->{$self->{instance} . '_' . $value->{name}} = $self->{statefile}->get(name => $self->{instance} . '_' . $value->{name}); if (!defined($old_datas->{$self->{instance} . '_' . $value->{name}})) { @@ -272,27 +268,21 @@ sub execute { } if ($quit == 2) { - $self->{error_msg} = "skipped (no value(s))"; + $self->{error_msg} = 'skipped (no value(s))'; return -10; } - + + if (defined($self->{statefile})) { + $self->{last_timestamp} = $self->{statefile}->get(name => 'last_timestamp'); + } + if ($quit == 1) { - $self->{error_msg} = "Buffer creation"; + $self->{error_msg} = 'Buffer creation'; return -1; } - - if (defined($self->{per_second}) && $self->{per_second} == 1) { - if (!defined($self->{last_timestamp})) { - $self->{last_timestamp} = $self->{statefile}->get(name => 'last_timestamp'); - } - if (!defined($self->{last_timestamp})) { - $self->{error_msg} = "Buffer creation"; - return -1; - } - } - + my $delta_time; - if (defined($self->{per_second}) && $self->{per_second} == 1) { + if (defined($self->{statefile}) && defined($self->{last_timestamp})) { $delta_time = $options{new_datas}->{last_timestamp} - $self->{last_timestamp}; if ($delta_time <= 0) { $delta_time = 1; @@ -300,7 +290,13 @@ sub execute { } if (defined($self->{closure_custom_calc})) { - return $self->{closure_custom_calc}->($self, old_datas => $old_datas, new_datas => $options{new_datas}, delta_time => $delta_time, extra_options => $self->{closure_custom_calc_extra_options}); + return $self->{closure_custom_calc}->( + $self, + old_datas => $old_datas, + new_datas => $options{new_datas}, + delta_time => $delta_time, + extra_options => $self->{closure_custom_calc_extra_options} + ); } return $self->calc(old_datas => $old_datas, new_datas => $options{new_datas}, delta_time => $delta_time); } diff --git a/changelog b/changelog index 4b477357f..3da1cd2e2 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ 2020-XX-XX Quentin Garnier + * Plugin added: ActiveMQ JMX + * Plugin added: VerneMQ Rest API * Plugin added: Ruckus SmartZone SNMP * Plugin added: Ruckus ZoneDirector SNMP * Plugin added: Ruckus ICX SNMP @@ -6,6 +8,7 @@ * Plugin added: Adva FSP150 SNMP * Plugin added: Lenovo Iomega SNMP * Plugin added: Netapp Santricity Rest API + * Plugin added: Timelinkmicro tms6001 SNMP * Plugin added: Bluemind * Plugin added: Mulesoft Rest API * Plugin added: Salesforce Rest API diff --git a/cloud/aws/apigateway/mode/latency.pm b/cloud/aws/apigateway/mode/latency.pm index 57bcc04b0..cd03b83ef 100644 --- a/cloud/aws/apigateway/mode/latency.pm +++ b/cloud/aws/apigateway/mode/latency.pm @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f ' . $metrics_mapping{$metric}->{output_unit}, perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1, + { value => $metric , template => '%.2f', label_extra_instance => 1, perfdata_unit => $metrics_mapping{$metric}->{perfdata_unit} } ], } diff --git a/cloud/aws/apigateway/mode/requests.pm b/cloud/aws/apigateway/mode/requests.pm index 0dd38bfa6..b95cd685b 100644 --- a/cloud/aws/apigateway/mode/requests.pm +++ b/cloud/aws/apigateway/mode/requests.pm @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/billing/mode/estimatedcharges.pm b/cloud/aws/billing/mode/estimatedcharges.pm index 70438cb99..1e7c1cf5b 100644 --- a/cloud/aws/billing/mode/estimatedcharges.pm +++ b/cloud/aws/billing/mode/estimatedcharges.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'estimated_charges' }, { name => 'display' } ], output_template => 'Estimated Charges: %.2f USD', perfdatas => [ - { value => 'estimated_charges_absolute', template => '%.2f', unit => 'USD', + { value => 'estimated_charges', template => '%.2f', unit => 'USD', label_extra_instance => 1 }, ], } diff --git a/cloud/aws/cloudfront/mode/errors.pm b/cloud/aws/cloudfront/mode/errors.pm index d6d337211..319a35e1a 100644 --- a/cloud/aws/cloudfront/mode/errors.pm +++ b/cloud/aws/cloudfront/mode/errors.pm @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/cloudwatch/mode/getmetrics.pm b/cloud/aws/cloudwatch/mode/getmetrics.pm index a0d19a1a0..7af2ec2e9 100644 --- a/cloud/aws/cloudwatch/mode/getmetrics.pm +++ b/cloud/aws/cloudwatch/mode/getmetrics.pm @@ -152,8 +152,8 @@ sub check_options { key_values => [ { name => $metric_name . '_' . $statistic }, { name => 'display' } ], output_template => $metric_name . ' ' . ucfirst($statistic) . ' : %s', perfdatas => [ - { label => lc($metric_name) . '_' . $statistic, value => $metric_name . '_' . $statistic . '_absolute', template => '%s', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric_name) . '_' . $statistic, value => $metric_name . '_' . $statistic , template => '%s', + label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/ec2/mode/cpu.pm b/cloud/aws/ec2/mode/cpu.pm index 08946c33f..09e44c44b 100644 --- a/cloud/aws/ec2/mode/cpu.pm +++ b/cloud/aws/ec2/mode/cpu.pm @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/ec2/mode/instancesstatus.pm b/cloud/aws/ec2/mode/instancesstatus.pm index ef689b0fb..ad595f569 100644 --- a/cloud/aws/ec2/mode/instancesstatus.pm +++ b/cloud/aws/ec2/mode/instancesstatus.pm @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'pending' } ], output_template => "Pending : %s", perfdatas => [ - { value => 'pending_absolute', template => '%d', min => 0 }, + { value => 'pending', template => '%d', min => 0 }, ], } }, @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'running' } ], output_template => "Running : %s", perfdatas => [ - { value => 'running_absolute', template => '%d', min => 0 }, + { value => 'running', template => '%d', min => 0 }, ], } }, @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'shutting-down' } ], output_template => "Shutting Down : %s", perfdatas => [ - { value => 'shutting-down_absolute', template => '%d', min => 0 }, + { value => 'shutting-down', template => '%d', min => 0 }, ], } }, @@ -80,7 +80,7 @@ sub set_counters { key_values => [ { name => 'terminated' } ], output_template => "Terminated : %s", perfdatas => [ - { value => 'terminated_absolute', template => '%d', min => 0 }, + { value => 'terminated', template => '%d', min => 0 }, ], } }, @@ -88,7 +88,7 @@ sub set_counters { key_values => [ { name => 'stopping' } ], output_template => "Stopping : %s", perfdatas => [ - { value => 'stopping_absolute', template => '%d', min => 0 }, + { value => 'stopping', template => '%d', min => 0 }, ], } }, @@ -96,7 +96,7 @@ sub set_counters { key_values => [ { name => 'stopped' } ], output_template => "Stopped : %s", perfdatas => [ - { value => 'stopped_absolute', template => '%d', min => 0 }, + { value => 'stopped', template => '%d', min => 0 }, ], } }, diff --git a/cloud/aws/ec2/mode/instancestypes.pm b/cloud/aws/ec2/mode/instancestypes.pm index 3da9abe5c..bf01ce51e 100644 --- a/cloud/aws/ec2/mode/instancestypes.pm +++ b/cloud/aws/ec2/mode/instancestypes.pm @@ -136,7 +136,7 @@ sub set_counters { key_values => [ { name => $type } ], output_template => $type . ": %s", perfdatas => [ - { value => $type . '_absolute', template => '%d', min => 0 }, + { value => $type , template => '%d', min => 0 }, ], } }; diff --git a/cloud/aws/ec2/mode/spotactiveinstances.pm b/cloud/aws/ec2/mode/spotactiveinstances.pm index e343cec54..f7a626242 100644 --- a/cloud/aws/ec2/mode/spotactiveinstances.pm +++ b/cloud/aws/ec2/mode/spotactiveinstances.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active instances : %s', perfdatas => [ - { label => 'active', value => 'active_absolute', template => '%s', + { label => 'active', value => 'active', template => '%s', min => 0 }, ], } @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'healthy' } ], output_template => 'Healthy instances : %s', perfdatas => [ - { label => 'healthy', value => 'healthy_absolute', template => '%s', + { label => 'healthy', value => 'healthy', template => '%s', min => 0 }, ], } @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'unhealthy' } ], output_template => 'Unhealty instances : %s', perfdatas => [ - { label => 'unhealthy', value => 'unhealthy_absolute', template => '%s', + { label => 'unhealthy', value => 'unhealthy', template => '%s', min => 0 }, ], } diff --git a/cloud/aws/elasticache/mode/connections.pm b/cloud/aws/elasticache/mode/connections.pm index b0717845a..b26c771b5 100644 --- a/cloud/aws/elasticache/mode/connections.pm +++ b/cloud/aws/elasticache/mode/connections.pm @@ -96,8 +96,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %d connections', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'conn', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'conn', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/elasticache/mode/cpu.pm b/cloud/aws/elasticache/mode/cpu.pm index 6a1f9f9c7..d011a190b 100644 --- a/cloud/aws/elasticache/mode/cpu.pm +++ b/cloud/aws/elasticache/mode/cpu.pm @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %.2f %%', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/elasticache/mode/items.pm b/cloud/aws/elasticache/mode/items.pm index c8d4b38b5..110b0bdd8 100644 --- a/cloud/aws/elasticache/mode/items.pm +++ b/cloud/aws/elasticache/mode/items.pm @@ -96,8 +96,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'stat' }, { name => 'timeframe' } ], output_template => $metric . ': %d items', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'items', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'items', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/elasticache/mode/replication.pm b/cloud/aws/elasticache/mode/replication.pm index 6c2871851..8077dbfec 100644 --- a/cloud/aws/elasticache/mode/replication.pm +++ b/cloud/aws/elasticache/mode/replication.pm @@ -113,8 +113,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'stat' }, { name => 'timeframe' } ], output_template => $metric . ': %.2f s', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/elasticache/mode/usagememcached.pm b/cloud/aws/elasticache/mode/usagememcached.pm index d9c0529fe..5ec41f09f 100644 --- a/cloud/aws/elasticache/mode/usagememcached.pm +++ b/cloud/aws/elasticache/mode/usagememcached.pm @@ -50,8 +50,8 @@ sub set_counters { output_template => $metric . ': %d %s', output_change_bytes => 1, perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/elasticache/mode/usageredis.pm b/cloud/aws/elasticache/mode/usageredis.pm index d7c2b6240..cb9ba8faa 100644 --- a/cloud/aws/elasticache/mode/usageredis.pm +++ b/cloud/aws/elasticache/mode/usageredis.pm @@ -50,8 +50,8 @@ sub set_counters { output_template => $metric . ': %d %s', output_change_bytes => 1, perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/elb/application/mode/connections.pm b/cloud/aws/elb/application/mode/connections.pm index 903837b04..0147f4451 100644 --- a/cloud/aws/elb/application/mode/connections.pm +++ b/cloud/aws/elb/application/mode/connections.pm @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/elb/application/mode/httpcodes.pm b/cloud/aws/elb/application/mode/httpcodes.pm index 5838b084b..77989d102 100644 --- a/cloud/aws/elb/application/mode/httpcodes.pm +++ b/cloud/aws/elb/application/mode/httpcodes.pm @@ -112,7 +112,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/elb/application/mode/targetshealth.pm b/cloud/aws/elb/application/mode/targetshealth.pm index 083139090..e2c55ae99 100644 --- a/cloud/aws/elb/application/mode/targetshealth.pm +++ b/cloud/aws/elb/application/mode/targetshealth.pm @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/elb/classic/mode/httpcodes.pm b/cloud/aws/elb/classic/mode/httpcodes.pm index db9b99ec1..4b4bda977 100644 --- a/cloud/aws/elb/classic/mode/httpcodes.pm +++ b/cloud/aws/elb/classic/mode/httpcodes.pm @@ -117,7 +117,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/elb/classic/mode/performances.pm b/cloud/aws/elb/classic/mode/performances.pm index a13980dfc..7d3d3452d 100644 --- a/cloud/aws/elb/classic/mode/performances.pm +++ b/cloud/aws/elb/classic/mode/performances.pm @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/elb/classic/mode/queues.pm b/cloud/aws/elb/classic/mode/queues.pm index 82a0f93a5..de6fee464 100644 --- a/cloud/aws/elb/classic/mode/queues.pm +++ b/cloud/aws/elb/classic/mode/queues.pm @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/elb/classic/mode/targetshealth.pm b/cloud/aws/elb/classic/mode/targetshealth.pm index 1d45c9b33..4c9b4f5ba 100644 --- a/cloud/aws/elb/classic/mode/targetshealth.pm +++ b/cloud/aws/elb/classic/mode/targetshealth.pm @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/elb/network/mode/targetshealth.pm b/cloud/aws/elb/network/mode/targetshealth.pm index dc145d268..8a9734588 100644 --- a/cloud/aws/elb/network/mode/targetshealth.pm +++ b/cloud/aws/elb/network/mode/targetshealth.pm @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/kinesis/mode/recordsstats.pm b/cloud/aws/kinesis/mode/recordsstats.pm index c98566e05..7744334eb 100644 --- a/cloud/aws/kinesis/mode/recordsstats.pm +++ b/cloud/aws/kinesis/mode/recordsstats.pm @@ -122,7 +122,7 @@ sub set_counters { output_template => ($metrics_mapping{$metric}->{change_bytes} != 0) ? $metrics_mapping{$metric}->{output} . ': %.2f %s' : $metrics_mapping{$metric}->{output} . ': %.2f', change_bytes => $metrics_mapping{$metric}->{output_change_bytes}, perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1, unit => $metrics_mapping{$metric}->{perf_unit} } + { value => $metric , template => '%.2f', label_extra_instance => 1, unit => $metrics_mapping{$metric}->{perf_unit} } ], } }; diff --git a/cloud/aws/kinesis/mode/streams.pm b/cloud/aws/kinesis/mode/streams.pm index 198556f0a..8a00ebae2 100644 --- a/cloud/aws/kinesis/mode/streams.pm +++ b/cloud/aws/kinesis/mode/streams.pm @@ -98,7 +98,7 @@ sub set_counters { output_template => ($metrics_mapping{$metric}->{change_bytes} != 0) ? $metrics_mapping{$metric}->{output} . ': %.2f %s' : $metrics_mapping{$metric}->{output} . ': %.2f', change_bytes => $metrics_mapping{$metric}->{output_change_bytes}, perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1, unit => $metrics_mapping{$metric}->{perf_unit} } + { value => $metric , template => '%.2f', label_extra_instance => 1, unit => $metrics_mapping{$metric}->{perf_unit} } ], } }; diff --git a/cloud/aws/lambda/mode/invocations.pm b/cloud/aws/lambda/mode/invocations.pm index fe3e08bf5..586485997 100644 --- a/cloud/aws/lambda/mode/invocations.pm +++ b/cloud/aws/lambda/mode/invocations.pm @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => $metric }, { name => 'display' } ], output_template => $metrics_mapping{$metric}->{output} . ': %.2f', perfdatas => [ - { value => $metric . '_absolute', template => '%.2f', label_extra_instance => 1 } + { value => $metric , template => '%.2f', label_extra_instance => 1 } ], } }; diff --git a/cloud/aws/rds/mode/connections.pm b/cloud/aws/rds/mode/connections.pm index 983fd682e..3a7ed2d4a 100644 --- a/cloud/aws/rds/mode/connections.pm +++ b/cloud/aws/rds/mode/connections.pm @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %d', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/rds/mode/cpu.pm b/cloud/aws/rds/mode/cpu.pm index 22fc2f1b1..a4681964f 100644 --- a/cloud/aws/rds/mode/cpu.pm +++ b/cloud/aws/rds/mode/cpu.pm @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %.2f', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %.2f %%', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/rds/mode/diskio.pm b/cloud/aws/rds/mode/diskio.pm index 7f498dfaf..86fb0e9af 100644 --- a/cloud/aws/rds/mode/diskio.pm +++ b/cloud/aws/rds/mode/diskio.pm @@ -50,8 +50,8 @@ sub set_counters { output_template => $metric . ': %.2f %s/s', output_change_bytes => 1, perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; @@ -62,8 +62,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %.2f iops', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %.2f s', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; @@ -86,8 +86,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %d', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/rds/mode/instancestatus.pm b/cloud/aws/rds/mode/instancestatus.pm index e9bb8ced9..e2fc227a6 100644 --- a/cloud/aws/rds/mode/instancestatus.pm +++ b/cloud/aws/rds/mode/instancestatus.pm @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'available' } ], output_template => "available : %s", perfdatas => [ - { label => 'total_available', value => 'available_absolute', template => '%d', min => 0 }, + { label => 'total_available', value => 'available', template => '%d', min => 0 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'failed' } ], output_template => "failed : %s", perfdatas => [ - { label => 'total_failed', value => 'failed_absolute', template => '%d', min => 0 }, + { label => 'total_failed', value => 'failed', template => '%d', min => 0 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'backing-up' } ], output_template => "backing-up : %s", perfdatas => [ - { label => 'total_backing_up', value => 'backing-up_absolute', template => '%d', min => 0 }, + { label => 'total_backing_up', value => 'backing-up', template => '%d', min => 0 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'maintenance' } ], output_template => "maintenance : %s", perfdatas => [ - { label => 'total_maintenance', value => 'maintenance_absolute', template => '%d', min => 0 }, + { label => 'total_maintenance', value => 'maintenance', template => '%d', min => 0 }, ], } }, @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'stopped' } ], output_template => "stopped : %s", perfdatas => [ - { label => 'total_stopped', value => 'stopped_absolute', template => '%d', min => 0 }, + { label => 'total_stopped', value => 'stopped', template => '%d', min => 0 }, ], } }, @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'storage-full' } ], output_template => "storage-full : %s", perfdatas => [ - { label => 'total_storage_full', value => 'storage-full_absolute', template => '%d', min => 0 }, + { label => 'total_storage_full', value => 'storage-full', template => '%d', min => 0 }, ], } }, diff --git a/cloud/aws/rds/mode/network.pm b/cloud/aws/rds/mode/network.pm index 2c34935ef..0612c7096 100644 --- a/cloud/aws/rds/mode/network.pm +++ b/cloud/aws/rds/mode/network.pm @@ -50,8 +50,8 @@ sub set_counters { output_template => $metric . ': %.2f %s/s', output_change_bytes => 1, perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/rds/mode/queries.pm b/cloud/aws/rds/mode/queries.pm index 6c8798d8b..dd4e9de2c 100644 --- a/cloud/aws/rds/mode/queries.pm +++ b/cloud/aws/rds/mode/queries.pm @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %d queries/s', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'queries/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'queries/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %.2f ms', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/rds/mode/transactions.pm b/cloud/aws/rds/mode/transactions.pm index a8cdd0b9a..d78956dfc 100644 --- a/cloud/aws/rds/mode/transactions.pm +++ b/cloud/aws/rds/mode/transactions.pm @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %d ops', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'ops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'ops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'type' }, { name => 'stat' } ], output_template => $metric . ': %.2f ms', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/rds/mode/volume.pm b/cloud/aws/rds/mode/volume.pm index e539019a0..dfe3e3214 100644 --- a/cloud/aws/rds/mode/volume.pm +++ b/cloud/aws/rds/mode/volume.pm @@ -98,8 +98,8 @@ sub set_counters { output_template => $metric . ': %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%.2f', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%.2f', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/s3/mode/bucketsize.pm b/cloud/aws/s3/mode/bucketsize.pm index 2344ce552..ac679e550 100644 --- a/cloud/aws/s3/mode/bucketsize.pm +++ b/cloud/aws/s3/mode/bucketsize.pm @@ -46,8 +46,8 @@ sub set_counters { output_template => $metric . ': %d %s', output_change_bytes => 1, perfdatas => [ - { label => lc($metric) . '_' . lc($storage_type) . '_' . lc($statistic), value => $metric . '_' . $storage_type . '_' . $statistic . '_absolute', - template => '%d', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($storage_type) . '_' . lc($statistic), value => $metric . '_' . $storage_type . '_' . $statistic , + template => '%d', unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/s3/mode/objects.pm b/cloud/aws/s3/mode/objects.pm index 46673f4d8..0912e66e5 100644 --- a/cloud/aws/s3/mode/objects.pm +++ b/cloud/aws/s3/mode/objects.pm @@ -44,8 +44,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %d objects', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'objects', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'objects', label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/aws/s3/mode/requests.pm b/cloud/aws/s3/mode/requests.pm index f6cfd7d0a..1c400b798 100644 --- a/cloud/aws/s3/mode/requests.pm +++ b/cloud/aws/s3/mode/requests.pm @@ -44,8 +44,8 @@ sub set_counters { key_values => [ { name => $metric . '_' . $statistic }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %d requests', perfdatas => [ - { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic . '_absolute', - template => '%d', unit => 'requests', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => lc($metric) . '_' . lc($statistic), value => $metric . '_' . $statistic , + template => '%d', unit => 'requests', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }; diff --git a/cloud/azure/compute/virtualmachine/mode/cpu.pm b/cloud/azure/compute/virtualmachine/mode/cpu.pm index d068f927e..b037eeadb 100644 --- a/cloud/azure/compute/virtualmachine/mode/cpu.pm +++ b/cloud/azure/compute/virtualmachine/mode/cpu.pm @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %.2f', perfdatas => [ - { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation . '_absolute', - template => '%.2f', unit => 'credits', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation , + template => '%.2f', unit => 'credits', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %.2f %%', perfdatas => [ - { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation . '_absolute', - template => '%.2f', unit => '%', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation , + template => '%.2f', unit => '%', label_extra_instance => 1, instance_use => 'display', min => 0, max => 100 }, ], } diff --git a/cloud/azure/compute/virtualmachine/mode/vmsizes.pm b/cloud/azure/compute/virtualmachine/mode/vmsizes.pm index 2d4344d0f..afa3dd949 100644 --- a/cloud/azure/compute/virtualmachine/mode/vmsizes.pm +++ b/cloud/azure/compute/virtualmachine/mode/vmsizes.pm @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => $size } ], output_template => $size . ": %s", perfdatas => [ - { label => $perf, value => $size . '_absolute', template => '%d', min => 0 }, + { label => $perf, value => $size , template => '%d', min => 0 }, ], } }; diff --git a/cloud/azure/compute/virtualmachine/mode/vmsstate.pm b/cloud/azure/compute/virtualmachine/mode/vmsstate.pm index 082ec453f..6722e2036 100644 --- a/cloud/azure/compute/virtualmachine/mode/vmsstate.pm +++ b/cloud/azure/compute/virtualmachine/mode/vmsstate.pm @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'running' } ], output_template => "running : %s", perfdatas => [ - { label => 'total_running', value => 'running_absolute', template => '%d', min => 0 }, + { label => 'total_running', value => 'running', template => '%d', min => 0 }, ], } }, @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'stopped' } ], output_template => "stopped : %s", perfdatas => [ - { label => 'total_stopped', value => 'stopped_absolute', template => '%d', min => 0 }, + { label => 'total_stopped', value => 'stopped', template => '%d', min => 0 }, ], } }, diff --git a/cloud/azure/database/sqldatabase/mode/databasesize.pm b/cloud/azure/database/sqldatabase/mode/databasesize.pm index 5026c67b6..36e0668d0 100644 --- a/cloud/azure/database/sqldatabase/mode/databasesize.pm +++ b/cloud/azure/database/sqldatabase/mode/databasesize.pm @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => 'Database size percentage: %.2f %%', perfdatas => [ - { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation . '_absolute', - template => '%.2f', unit => '%', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation , + template => '%.2f', unit => '%', label_extra_instance => 1, instance_use => 'display', min => 0, max => 100 }, ], } diff --git a/cloud/azure/management/monitor/mode/alert.pm b/cloud/azure/management/monitor/mode/alert.pm index 18aeddbfc..addeb7fed 100644 --- a/cloud/azure/management/monitor/mode/alert.pm +++ b/cloud/azure/management/monitor/mode/alert.pm @@ -30,8 +30,8 @@ sub custom_output { return sprintf( "alert severity: '%s', Count: '%d'", - $self->{result_values}->{severity_absolute}, - $self->{result_values}->{count_absolute} + $self->{result_values}->{severity}, + $self->{result_values}->{count} ); } @@ -39,8 +39,8 @@ sub custom_perfdata { my ($self, %options) = @_; $self->{output}->perfdata_add( - nlabel => 'alerts.' . lc($self->{result_values}->{severity_absolute}) . '.count', - value => $self->{result_values}->{count_absolute}, + nlabel => 'alerts.' . lc($self->{result_values}->{severity}) . '.count', + value => $self->{result_values}->{count}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}) ); @@ -57,7 +57,7 @@ sub set_counters { { label => 'count', set => { key_values => [ { name => 'severity' }, { name => 'count' } ], closure_custom_output => $self->can('custom_output'), - threshold_use => 'count_absolute', + threshold_use => 'count', closure_custom_perfdata => $self->can('custom_perfdata'), } }, diff --git a/cloud/azure/management/monitor/mode/logs.pm b/cloud/azure/management/monitor/mode/logs.pm index f238c4b81..52ab7ef4c 100644 --- a/cloud/azure/management/monitor/mode/logs.pm +++ b/cloud/azure/management/monitor/mode/logs.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total logs: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 } + { value => 'total', template => '%s', min => 0 } ] } } diff --git a/cloud/azure/management/recovery/mode/backupitemsstatus.pm b/cloud/azure/management/recovery/mode/backupitemsstatus.pm index c3960b30f..59d896bdd 100644 --- a/cloud/azure/management/recovery/mode/backupitemsstatus.pm +++ b/cloud/azure/management/recovery/mode/backupitemsstatus.pm @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'completed' } ], output_template => "completed : %s", perfdatas => [ - { label => 'total_completed', value => 'completed_absolute', template => '%d', min => 0 } + { label => 'total_completed', value => 'completed', template => '%d', min => 0 } ] } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'failed' } ], output_template => "failed : %s", perfdatas => [ - { label => 'total_failed', value => 'failed_absolute', template => '%d', min => 0 } + { label => 'total_failed', value => 'failed', template => '%d', min => 0 } ] } } diff --git a/cloud/azure/management/recovery/mode/backupjobsstatus.pm b/cloud/azure/management/recovery/mode/backupjobsstatus.pm index 5e1d778a1..f80a36518 100644 --- a/cloud/azure/management/recovery/mode/backupjobsstatus.pm +++ b/cloud/azure/management/recovery/mode/backupjobsstatus.pm @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'completed' } ], output_template => "completed : %s", perfdatas => [ - { label => 'total_completed', value => 'completed_absolute', template => '%d', min => 0 }, + { label => 'total_completed', value => 'completed', template => '%d', min => 0 }, ], } }, @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'failed' } ], output_template => "failed : %s", perfdatas => [ - { label => 'total_failed', value => 'failed_absolute', template => '%d', min => 0 }, + { label => 'total_failed', value => 'failed', template => '%d', min => 0 }, ], } }, @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'inprogress' } ], output_template => "in progress : %s", perfdatas => [ - { label => 'total_inprogress', value => 'inprogress_absolute', template => '%d', min => 0 }, + { label => 'total_inprogress', value => 'inprogress', template => '%d', min => 0 }, ], } }, diff --git a/cloud/azure/management/resource/mode/deploymentsstatus.pm b/cloud/azure/management/resource/mode/deploymentsstatus.pm index ae3b4da26..79e0ef70d 100644 --- a/cloud/azure/management/resource/mode/deploymentsstatus.pm +++ b/cloud/azure/management/resource/mode/deploymentsstatus.pm @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'succeeded' } ], output_template => "succeeded : %s", perfdatas => [ - { label => 'total_succeeded', value => 'succeeded_absolute', template => '%d', min => 0 }, + { label => 'total_succeeded', value => 'succeeded', template => '%d', min => 0 }, ], } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'failed' } ], output_template => "failed : %s", perfdatas => [ - { label => 'total_failed', value => 'failed_absolute', template => '%d', min => 0 }, + { label => 'total_failed', value => 'failed', template => '%d', min => 0 }, ], } }, diff --git a/cloud/azure/management/resource/mode/items.pm b/cloud/azure/management/resource/mode/items.pm index 68c84bbde..18985917a 100644 --- a/cloud/azure/management/resource/mode/items.pm +++ b/cloud/azure/management/resource/mode/items.pm @@ -43,8 +43,8 @@ sub set_counters { key_values => [ { name => 'total' } , { name => 'display' } ], output_template => "Total number of items : %s", perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'display_absolute', min => 0 }, + { label => 'total', value => 'total', template => '%d', + label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } }, @@ -52,8 +52,8 @@ sub set_counters { key_values => [ { name => 'compute' } , { name => 'display' } ], output_template => "Compute: %s", perfdatas => [ - { label => 'compute', value => 'compute_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'display_absolute', min => 0 }, + { label => 'compute', value => 'compute', template => '%d', + label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } }, @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => 'storage' } , { name => 'display' } ], output_template => "Storage: %s", perfdatas => [ - { label => 'storage', value => 'storage_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'display_absolute', min => 0 }, + { label => 'storage', value => 'storage', template => '%d', + label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } }, @@ -70,8 +70,8 @@ sub set_counters { key_values => [ { name => 'network' } , { name => 'display' } ], output_template => "Network: %s", perfdatas => [ - { label => 'network', value => 'network_absolute', template => '%d', - label_extra_instance => 1, instance_use => 'display_absolute', min => 0 }, + { label => 'network', value => 'network', template => '%d', + label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } }, diff --git a/cloud/azure/network/vpngateway/mode/sitetraffic.pm b/cloud/azure/network/vpngateway/mode/sitetraffic.pm index e86d38c71..c706f3fca 100644 --- a/cloud/azure/network/vpngateway/mode/sitetraffic.pm +++ b/cloud/azure/network/vpngateway/mode/sitetraffic.pm @@ -114,8 +114,8 @@ sub set_counters { { name => $metric_perf . '_' . $aggregation . '_name' }, { name => 'stat' } ], output_template => 'P2S Connection Count: %d', perfdatas => [ - { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation . '_absolute', - template => '%d', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation , + template => '%d', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm b/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm index bc8f2b9c2..4a130da00 100644 --- a/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm +++ b/cloud/azure/storage/storageaccount/mode/accountusedcapacity.pm @@ -46,8 +46,8 @@ sub set_counters { output_template => $metric . ': %s %s', output_change_bytes => 1, perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/blobcapacity.pm b/cloud/azure/storage/storageaccount/mode/blobcapacity.pm index 607c7f1a3..46c25e2ee 100644 --- a/cloud/azure/storage/storageaccount/mode/blobcapacity.pm +++ b/cloud/azure/storage/storageaccount/mode/blobcapacity.pm @@ -46,8 +46,8 @@ sub set_counters { output_template => $metric . ': %s %s', output_change_bytes => 1, perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm b/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm index 5d2c5f4cd..9050beeec 100644 --- a/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm +++ b/cloud/azure/storage/storageaccount/mode/blobcontainercount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/blobcount.pm b/cloud/azure/storage/storageaccount/mode/blobcount.pm index 56a18b1f3..223b94c32 100644 --- a/cloud/azure/storage/storageaccount/mode/blobcount.pm +++ b/cloud/azure/storage/storageaccount/mode/blobcount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/filecapacity.pm b/cloud/azure/storage/storageaccount/mode/filecapacity.pm index a47624e6c..d926550ad 100644 --- a/cloud/azure/storage/storageaccount/mode/filecapacity.pm +++ b/cloud/azure/storage/storageaccount/mode/filecapacity.pm @@ -46,8 +46,8 @@ sub set_counters { output_template => $metric . ': %s %s', output_change_bytes => 1, perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/filecount.pm b/cloud/azure/storage/storageaccount/mode/filecount.pm index 9094e53ab..bc4461753 100644 --- a/cloud/azure/storage/storageaccount/mode/filecount.pm +++ b/cloud/azure/storage/storageaccount/mode/filecount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/filesharecount.pm b/cloud/azure/storage/storageaccount/mode/filesharecount.pm index 13af6a010..069ad7777 100644 --- a/cloud/azure/storage/storageaccount/mode/filesharecount.pm +++ b/cloud/azure/storage/storageaccount/mode/filesharecount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/queuecapacity.pm b/cloud/azure/storage/storageaccount/mode/queuecapacity.pm index 080b70ce4..ae484fc81 100644 --- a/cloud/azure/storage/storageaccount/mode/queuecapacity.pm +++ b/cloud/azure/storage/storageaccount/mode/queuecapacity.pm @@ -46,8 +46,8 @@ sub set_counters { output_template => $metric . ': %s %s', output_change_bytes => 1, perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/queuecount.pm b/cloud/azure/storage/storageaccount/mode/queuecount.pm index d6424f226..02286d1d1 100644 --- a/cloud/azure/storage/storageaccount/mode/queuecount.pm +++ b/cloud/azure/storage/storageaccount/mode/queuecount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm b/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm index d5ea43dc7..ac17264cd 100644 --- a/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm +++ b/cloud/azure/storage/storageaccount/mode/queuemessagecount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/tablecapacity.pm b/cloud/azure/storage/storageaccount/mode/tablecapacity.pm index 7d9ce5b38..5c8309597 100644 --- a/cloud/azure/storage/storageaccount/mode/tablecapacity.pm +++ b/cloud/azure/storage/storageaccount/mode/tablecapacity.pm @@ -46,8 +46,8 @@ sub set_counters { output_template => $metric . ': %s %s', output_change_bytes => 1, perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', unit => 'B', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/tablecount.pm b/cloud/azure/storage/storageaccount/mode/tablecount.pm index 7ee41e1c9..5093396c8 100644 --- a/cloud/azure/storage/storageaccount/mode/tablecount.pm +++ b/cloud/azure/storage/storageaccount/mode/tablecount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/tableentitycount.pm b/cloud/azure/storage/storageaccount/mode/tableentitycount.pm index b9d62f697..09a87c7ef 100644 --- a/cloud/azure/storage/storageaccount/mode/tableentitycount.pm +++ b/cloud/azure/storage/storageaccount/mode/tableentitycount.pm @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %s', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%s', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%s', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm b/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm index 71eb5e517..5fcf230c4 100644 --- a/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm +++ b/cloud/azure/storage/storageaccount/mode/transactionsavailability.pm @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %.2f %%', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%.2f', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%.2f', label_extra_instance => 1, instance_use => 'display', unit => '%', min => 0, max => 100 }, ], } diff --git a/cloud/azure/storage/storageaccount/mode/transactionslatency.pm b/cloud/azure/storage/storageaccount/mode/transactionslatency.pm index 11803fa58..d00778878 100644 --- a/cloud/azure/storage/storageaccount/mode/transactionslatency.pm +++ b/cloud/azure/storage/storageaccount/mode/transactionslatency.pm @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => $metric_label . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ], output_template => $metric . ': %.2f ms', perfdatas => [ - { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation . '_absolute', - template => '%.2f', unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute', + { label => $metric_label . '_' . $aggregation, value => $metric_label . '_' . $aggregation , + template => '%.2f', unit => 'ms', label_extra_instance => 1, instance_use => 'display', min => 0 }, ], } diff --git a/cloud/cadvisor/restapi/mode/containerusage.pm b/cloud/cadvisor/restapi/mode/containerusage.pm index f18382280..eeaf7acb3 100644 --- a/cloud/cadvisor/restapi/mode/containerusage.pm +++ b/cloud/cadvisor/restapi/mode/containerusage.pm @@ -29,10 +29,10 @@ use DateTime; sub custom_memory_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{memory_total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{memory_used_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{memory_total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{memory_used}); my $msg = sprintf("Memory Used: %s (%.2f%%) Total: %s" , - $total_used_value . " " . $total_used_unit, 100 * $self->{result_values}->{memory_used_absolute} / $self->{result_values}->{memory_total_absolute}, + $total_used_value . " " . $total_used_unit, 100 * $self->{result_values}->{memory_used} / $self->{result_values}->{memory_total}, $total_size_value . " " . $total_size_unit); return $msg; } @@ -48,40 +48,40 @@ sub set_counters { { label => 'cpu-number', set => { key_values => [ { name => 'cpu_number'}, { name => 'display' } ], output_template => 'CPU: %d core(s)', - output_use => 'cpu_number_absolute', + output_use => 'cpu_number', perfdatas => [ - { label => 'cpu_number', value => 'cpu_number_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_number', value => 'cpu_number', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'cpu-total', set => { key_values => [ { name => 'cpu_total'}, { name => 'display' } ], output_template => 'CPU Usage: %.2f %%', - output_use => 'cpu_total_absolute', + output_use => 'cpu_total', perfdatas => [ - { label => 'cpu_total', value => 'cpu_total_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_total', value => 'cpu_total', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'cpu-user', set => { key_values => [ { name => 'cpu_user'}, { name => 'display' } ], output_template => 'CPU User: %.2f %%', - output_use => 'cpu_user_absolute', + output_use => 'cpu_user', perfdatas => [ - { label => 'cpu_user', value => 'cpu_user_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_user', value => 'cpu_user', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'cpu-system', set => { key_values => [ { name => 'cpu_system' }, { name => 'display' } ], output_template => 'CPU System: %.2f %%', - output_use => 'cpu_system_absolute', + output_use => 'cpu_system', perfdatas => [ - { label => 'cpu_system', value => 'cpu_system_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_system', value => 'cpu_system', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -90,8 +90,8 @@ sub set_counters { output_change_bytes => 1, closure_custom_output => $self->can('custom_memory_output'), perfdatas => [ - { label => 'memory_used', value => 'memory_used_absolute', template => '%s', - min => 0, max => 'memory_total_absolute',unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'memory_used', value => 'memory_used', template => '%s', + min => 0, max => 'memory_total',unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -100,8 +100,8 @@ sub set_counters { output_change_bytes => 1, output_template => 'Memory Cache: %s %s', perfdatas => [ - { label => 'memory_cache', value => 'memory_cache_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'memory_cache', value => 'memory_cache', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -110,8 +110,8 @@ sub set_counters { output_change_bytes => 1, output_template => 'Memory RSS: %s %s', perfdatas => [ - { label => 'memory_rss', value => 'memory_rss_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'memory_rss', value => 'memory_rss', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -120,8 +120,8 @@ sub set_counters { output_change_bytes => 1, output_template => 'Swap: %s %s', perfdatas => [ - { label => 'swap', value => 'swap_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'swap', value => 'swap', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/cadvisor/restapi/mode/diskio.pm b/cloud/cadvisor/restapi/mode/diskio.pm index 84085d28f..568a57bf8 100644 --- a/cloud/cadvisor/restapi/mode/diskio.pm +++ b/cloud/cadvisor/restapi/mode/diskio.pm @@ -39,8 +39,8 @@ sub set_counters { output_change_bytes => 1, output_template => 'Disk IO Read: %s %s/s', perfdatas => [ - { label => 'diskio_read', value => 'diskio_read_absolute', template => '%.2f', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'diskio_read', value => 'diskio_read', template => '%.2f', + min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -49,8 +49,8 @@ sub set_counters { output_change_bytes => 1, output_template => 'Disk IO Write: %s %s/s', perfdatas => [ - { label => 'diskio_write', value => 'diskio_write_absolute', template => '%.2f', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'diskio_write', value => 'diskio_write', template => '%.2f', + min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/cadvisor/restapi/mode/nodestatus.pm b/cloud/cadvisor/restapi/mode/nodestatus.pm index 5ed9d1dc3..12d715bb9 100644 --- a/cloud/cadvisor/restapi/mode/nodestatus.pm +++ b/cloud/cadvisor/restapi/mode/nodestatus.pm @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'containers_running' }, { name => 'display' } ], output_template => 'Containers Running : %s', perfdatas => [ - { label => 'containers_running', value => 'containers_running_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'containers_running', value => 'containers_running', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'num_cores' }, { name => 'display' } ], output_template => 'CPU cores: %s', perfdatas => [ - { label => 'num_cores', value => 'num_cores_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'num_cores', value => 'num_cores', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'memory_capacity' }, { name => 'display' } ], output_template => 'Mem capacity %s %s', perfdatas => [ - { label => 'memory_capacity', value => 'memory_capacity_absolute', unit => 'B', output_change_bytes => 1, template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'memory_capacity', value => 'memory_capacity', unit => 'B', output_change_bytes => 1, template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'cpu_frequency' }, { name => 'display' } ], output_template => 'CPU frequency %s %s', perfdatas => [ - { label => 'cpu_frequency', value => 'cpu_frequency_absolute', unit => 'Hz', output_change_bytes => 1, template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_frequency', value => 'cpu_frequency', unit => 'Hz', output_change_bytes => 1, template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/cadvisor/restapi/mode/traffic.pm b/cloud/cadvisor/restapi/mode/traffic.pm index f303bf84d..603da6967 100644 --- a/cloud/cadvisor/restapi/mode/traffic.pm +++ b/cloud/cadvisor/restapi/mode/traffic.pm @@ -40,8 +40,8 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic In: %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_absolute', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', value => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -50,8 +50,8 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic Out: %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_absolute', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', value => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/cloudfoundry/restapi/mode/appsstate.pm b/cloud/cloudfoundry/restapi/mode/appsstate.pm index 8ea16b612..3f02fdc0b 100644 --- a/cloud/cloudfoundry/restapi/mode/appsstate.pm +++ b/cloud/cloudfoundry/restapi/mode/appsstate.pm @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'started' } ], output_template => 'Started : %d', perfdatas => [ - { label => 'started', value => 'started_absolute', template => '%d', + { label => 'started', value => 'started', template => '%d', min => 0 }, ], } @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'stopped' } ], output_template => 'Stopped : %d', perfdatas => [ - { label => 'stopped', value => 'stopped_absolute', template => '%d', + { label => 'stopped', value => 'stopped', template => '%d', min => 0 }, ], } diff --git a/cloud/cloudfoundry/restapi/mode/instancesstate.pm b/cloud/cloudfoundry/restapi/mode/instancesstate.pm index b5f4bfa8f..5091b6d93 100644 --- a/cloud/cloudfoundry/restapi/mode/instancesstate.pm +++ b/cloud/cloudfoundry/restapi/mode/instancesstate.pm @@ -137,7 +137,7 @@ sub set_counters { key_values => [ { name => 'running' } ], output_template => 'Running : %d', perfdatas => [ - { label => 'running', value => 'running_absolute', template => '%d', + { label => 'running', value => 'running', template => '%d', min => 0 }, ], } @@ -146,7 +146,7 @@ sub set_counters { key_values => [ { name => 'stopped' } ], output_template => 'Stopped : %d', perfdatas => [ - { label => 'stopped', value => 'stopped_absolute', template => '%d', + { label => 'stopped', value => 'stopped', template => '%d', min => 0 }, ], } @@ -155,7 +155,7 @@ sub set_counters { key_values => [ { name => 'crashed' } ], output_template => 'Crashed : %d', perfdatas => [ - { label => 'crashed', value => 'crashed_absolute', template => '%d', + { label => 'crashed', value => 'crashed', template => '%d', min => 0 }, ], } diff --git a/cloud/docker/restapi/mode/containerusage.pm b/cloud/docker/restapi/mode/containerusage.pm index 616d85581..7f4c9260a 100644 --- a/cloud/docker/restapi/mode/containerusage.pm +++ b/cloud/docker/restapi/mode/containerusage.pm @@ -138,22 +138,20 @@ sub set_counters { } }, { label => 'read-iops', set => { - key_values => [ { name => 'read_io', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'read_io', per_second => 1 }, { name => 'display' } ], output_template => 'Read IOPs : %.2f', output_error_template => "Read IOPs : %s", perfdatas => [ - { label => 'read_iops', value => 'read_io_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-iops', set => { - key_values => [ { name => 'write_io', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'write_io', per_second => 1 }, { name => 'display' } ], output_template => 'Write IOPs : %.2f', output_error_template => "Write IOPs : %s", perfdatas => [ - { label => 'write_iops', value => 'write_io_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -161,22 +159,22 @@ sub set_counters { $self->{maps_counters}->{containers_traffic} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic In : %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 2, output_template => 'Traffic Out : %s %s/s', perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -188,15 +186,14 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "container-id:s" => { name => 'container_id' }, - "container-name:s" => { name => 'container_name' }, - "filter-name:s" => { name => 'filter_name' }, - "use-name" => { name => 'use_name' }, - "warning-container-status:s" => { name => 'warning_container_status', default => '' }, - "critical-container-status:s" => { name => 'critical_container_status', default => '' }, - }); + $options{options}->add_options(arguments => { + 'container-id:s' => { name => 'container_id' }, + 'container-name:s' => { name => 'container_name' }, + 'filter-name:s' => { name => 'filter_name' }, + 'use-name' => { name => 'use_name' }, + 'warning-container-status:s' => { name => 'warning_container_status', default => '' }, + 'critical-container-status:s' => { name => 'critical_container_status', default => '' }, + }); $self->{statefile_cache_containers} = centreon::plugins::statefile->new(%options); return $self; diff --git a/cloud/docker/restapi/mode/nodestatus.pm b/cloud/docker/restapi/mode/nodestatus.pm index 985ce21f4..0320818da 100644 --- a/cloud/docker/restapi/mode/nodestatus.pm +++ b/cloud/docker/restapi/mode/nodestatus.pm @@ -66,8 +66,8 @@ sub set_counters { key_values => [ { name => 'containers_running' }, { name => 'display' } ], output_template => 'Containers Running : %s', perfdatas => [ - { label => 'containers_running', value => 'containers_running_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'containers_running', value => 'containers_running', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'containers_stopped' }, { name => 'display' } ], output_template => 'Containers Stopped : %s', perfdatas => [ - { label => 'containers_stopped', value => 'containers_stopped_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'containers_stopped', value => 'containers_stopped', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -84,8 +84,8 @@ sub set_counters { key_values => [ { name => 'containers_paused' }, { name => 'display' } ], output_template => 'Containers Paused : %s', perfdatas => [ - { label => 'containers_paused', value => 'containers_paused_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'containers_paused', value => 'containers_paused', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/ibm/softlayer/mode/events.pm b/cloud/ibm/softlayer/mode/events.pm index 28ac5c07a..4db7b457d 100644 --- a/cloud/ibm/softlayer/mode/events.pm +++ b/cloud/ibm/softlayer/mode/events.pm @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active : %d', perfdatas => [ - { label => 'active_events', value => 'active_absolute', template => '%d', + { label => 'active_events', value => 'active', template => '%d', min => 0 }, ], } @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'completed' } ], output_template => 'Completed : %d', perfdatas => [ - { label => 'completed_events', value => 'completed_absolute', template => '%d', + { label => 'completed_events', value => 'completed', template => '%d', min => 0 }, ], } @@ -95,7 +95,7 @@ sub set_counters { key_values => [ { name => 'published' } ], output_template => 'Published : %d', perfdatas => [ - { label => 'published_events', value => 'published_absolute', template => '%d', + { label => 'published_events', value => 'published', template => '%d', min => 0 }, ], } diff --git a/cloud/ibm/softlayer/mode/opentickets.pm b/cloud/ibm/softlayer/mode/opentickets.pm index fac2cfc2e..0119294b5 100644 --- a/cloud/ibm/softlayer/mode/opentickets.pm +++ b/cloud/ibm/softlayer/mode/opentickets.pm @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'open' } ], output_template => 'Number of open tickets : %d', perfdatas => [ - { label => 'open_tickets', value => 'open_absolute', template => '%d', + { label => 'open_tickets', value => 'open', template => '%d', min => 0 }, ], } diff --git a/cloud/kubernetes/mode/podstatus.pm b/cloud/kubernetes/mode/podstatus.pm index f05217be8..4f6e0402a 100644 --- a/cloud/kubernetes/mode/podstatus.pm +++ b/cloud/kubernetes/mode/podstatus.pm @@ -155,8 +155,8 @@ sub set_counters { key_values => [ { name => 'restarts_total' }, { name => 'display' } ], output_template => 'Restarts: %d', perfdatas => [ - { label => 'restarts_count', value => 'restarts_total_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'restarts_count', value => 'restarts_total', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -174,8 +174,8 @@ sub set_counters { key_values => [ { name => 'restarts' }, { name => 'perf' } ], output_template => 'Restarts: %d', perfdatas => [ - { label => 'restarts_count', value => 'restarts_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'restarts_count', value => 'restarts', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, diff --git a/cloud/microsoft/office365/exchange/mode/emailactivity.pm b/cloud/microsoft/office365/exchange/mode/emailactivity.pm index 2aec580b7..7cf50eb44 100644 --- a/cloud/microsoft/office365/exchange/mode/emailactivity.pm +++ b/cloud/microsoft/office365/exchange/mode/emailactivity.pm @@ -113,7 +113,7 @@ sub set_counters { key_values => [ { name => 'send_count' } ], output_template => 'Send Count: %d', perfdatas => [ - { label => 'total_send_count', value => 'send_count_absolute', template => '%d', + { label => 'total_send_count', value => 'send_count', template => '%d', min => 0 }, ], } @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'receive_count' } ], output_template => 'Receive Count: %d', perfdatas => [ - { label => 'total_receive_count', value => 'receive_count_absolute', template => '%d', + { label => 'total_receive_count', value => 'receive_count', template => '%d', min => 0 }, ], } @@ -131,7 +131,7 @@ sub set_counters { key_values => [ { name => 'read_count' } ], output_template => 'Read Count: %d', perfdatas => [ - { label => 'total_read_count', value => 'read_count_absolute', template => '%d', + { label => 'total_read_count', value => 'read_count', template => '%d', min => 0 }, ], } @@ -142,8 +142,8 @@ sub set_counters { key_values => [ { name => 'send_count' }, { name => 'name' } ], output_template => 'Send Count: %d', perfdatas => [ - { label => 'send_count', value => 'send_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'send_count', value => 'send_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -151,8 +151,8 @@ sub set_counters { key_values => [ { name => 'receive_count' }, { name => 'name' } ], output_template => 'Receive Count: %d', perfdatas => [ - { label => 'receive_count', value => 'receive_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'receive_count', value => 'receive_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -160,8 +160,8 @@ sub set_counters { key_values => [ { name => 'read_count' }, { name => 'name' } ], output_template => 'Read Count: %d', perfdatas => [ - { label => 'read_count', value => 'read_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'read_count', value => 'read_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/cloud/microsoft/office365/exchange/mode/mailboxusage.pm b/cloud/microsoft/office365/exchange/mode/mailboxusage.pm index cd13735c4..acca62088 100644 --- a/cloud/microsoft/office365/exchange/mode/mailboxusage.pm +++ b/cloud/microsoft/office365/exchange/mode/mailboxusage.pm @@ -177,7 +177,7 @@ sub set_counters { output_template => 'Usage (active mailboxes): %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'storage_used_active', value => 'storage_used_active_absolute', template => '%d', + { label => 'storage_used_active', value => 'storage_used_active', template => '%d', min => 0, unit => 'B' }, ], } @@ -187,7 +187,7 @@ sub set_counters { output_template => 'Usage (inactive mailboxes): %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'storage_used_inactive', value => 'storage_used_inactive_absolute', template => '%d', + { label => 'storage_used_inactive', value => 'storage_used_inactive', template => '%d', min => 0, unit => 'B' }, ], } @@ -207,7 +207,7 @@ sub set_counters { key_values => [ { name => 'items' } ], output_template => 'Items: %d', perfdatas => [ - { label => 'items', value => 'items_absolute', template => '%d', + { label => 'items', value => 'items', template => '%d', min => 0 }, ], } diff --git a/cloud/microsoft/office365/onedrive/mode/usage.pm b/cloud/microsoft/office365/onedrive/mode/usage.pm index b46017d7f..e22e1fd97 100644 --- a/cloud/microsoft/office365/onedrive/mode/usage.pm +++ b/cloud/microsoft/office365/onedrive/mode/usage.pm @@ -178,7 +178,7 @@ sub set_counters { output_template => 'Usage (active sites): %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'storage_used_active', value => 'storage_used_active_absolute', template => '%d', + { label => 'storage_used_active', value => 'storage_used_active', template => '%d', min => 0, unit => 'B' }, ], } @@ -188,7 +188,7 @@ sub set_counters { output_template => 'Usage (inactive sites): %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'storage_used_inactive', value => 'storage_used_inactive_absolute', template => '%d', + { label => 'storage_used_inactive', value => 'storage_used_inactive', template => '%d', min => 0, unit => 'B' }, ], } @@ -197,7 +197,7 @@ sub set_counters { key_values => [ { name => 'file_count' } ], output_template => 'File Count (active sites): %d', perfdatas => [ - { label => 'total_file_count', value => 'file_count_absolute', template => '%d', + { label => 'total_file_count', value => 'file_count', template => '%d', min => 0 }, ], } @@ -206,7 +206,7 @@ sub set_counters { key_values => [ { name => 'active_file_count' } ], output_template => 'Active File Count (active sites): %d', perfdatas => [ - { label => 'total_active_file_count', value => 'active_file_count_absolute', template => '%d', + { label => 'total_active_file_count', value => 'active_file_count', template => '%d', min => 0 }, ], } @@ -225,8 +225,8 @@ sub set_counters { key_values => [ { name => 'file_count' }, { name => 'url' }, { name => 'owner' } ], output_template => 'File Count: %d', perfdatas => [ - { label => 'file_count', value => 'file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'url_absolute' }, + { label => 'file_count', value => 'file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'url' }, ], } }, @@ -234,8 +234,8 @@ sub set_counters { key_values => [ { name => 'active_file_count' }, { name => 'url' }, { name => 'owner' } ], output_template => 'Active File Count: %d', perfdatas => [ - { label => 'active_file_count', value => 'active_file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'url_absolute' }, + { label => 'active_file_count', value => 'active_file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'url' }, ], } }, diff --git a/cloud/microsoft/office365/sharepoint/mode/siteusage.pm b/cloud/microsoft/office365/sharepoint/mode/siteusage.pm index 7da0645fa..35ddd321a 100644 --- a/cloud/microsoft/office365/sharepoint/mode/siteusage.pm +++ b/cloud/microsoft/office365/sharepoint/mode/siteusage.pm @@ -178,7 +178,7 @@ sub set_counters { output_template => 'Usage (active sites): %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'storage_used_active', value => 'storage_used_active_absolute', template => '%d', + { label => 'storage_used_active', value => 'storage_used_active', template => '%d', min => 0, unit => 'B' }, ], } @@ -188,7 +188,7 @@ sub set_counters { output_template => 'Usage (inactive sites): %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'storage_used_inactive', value => 'storage_used_inactive_absolute', template => '%d', + { label => 'storage_used_inactive', value => 'storage_used_inactive', template => '%d', min => 0, unit => 'B' }, ], } @@ -197,7 +197,7 @@ sub set_counters { key_values => [ { name => 'file_count' } ], output_template => 'File Count (active sites): %d', perfdatas => [ - { label => 'total_file_count', value => 'file_count_absolute', template => '%d', + { label => 'total_file_count', value => 'file_count', template => '%d', min => 0 }, ], } @@ -206,7 +206,7 @@ sub set_counters { key_values => [ { name => 'active_file_count' } ], output_template => 'Active File Count (active sites): %d', perfdatas => [ - { label => 'total_active_file_count', value => 'active_file_count_absolute', template => '%d', + { label => 'total_active_file_count', value => 'active_file_count', template => '%d', min => 0 }, ], } @@ -215,7 +215,7 @@ sub set_counters { key_values => [ { name => 'visited_page_count' } ], output_template => 'Visited Page Count (active sites): %d', perfdatas => [ - { label => 'total_visited_page_count', value => 'visited_page_count_absolute', template => '%d', + { label => 'total_visited_page_count', value => 'visited_page_count', template => '%d', min => 0 }, ], } @@ -224,7 +224,7 @@ sub set_counters { key_values => [ { name => 'page_view_count' } ], output_template => 'Page View Count (active sites): %d', perfdatas => [ - { label => 'total_page_view_count', value => 'page_view_count_absolute', template => '%d', + { label => 'total_page_view_count', value => 'page_view_count', template => '%d', min => 0 }, ], } @@ -243,8 +243,8 @@ sub set_counters { key_values => [ { name => 'file_count' }, { name => 'url' }, { name => 'id' } ], output_template => 'File Count: %d', perfdatas => [ - { label => 'file_count', value => 'file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'id_absolute' }, + { label => 'file_count', value => 'file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'id' }, ], } }, @@ -252,8 +252,8 @@ sub set_counters { key_values => [ { name => 'active_file_count' }, { name => 'url' }, { name => 'id' } ], output_template => 'Active File Count: %d', perfdatas => [ - { label => 'active_file_count', value => 'active_file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'id_absolute' }, + { label => 'active_file_count', value => 'active_file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'id' }, ], } }, @@ -261,8 +261,8 @@ sub set_counters { key_values => [ { name => 'visited_page_count' }, { name => 'url' }, { name => 'id' } ], output_template => 'Visited Page Count: %d', perfdatas => [ - { label => 'visited_page_count', value => 'visited_page_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'id_absolute' }, + { label => 'visited_page_count', value => 'visited_page_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'id' }, ], } }, @@ -270,8 +270,8 @@ sub set_counters { key_values => [ { name => 'page_view_count' }, { name => 'url' }, { name => 'id' } ], output_template => 'Page View Count: %d', perfdatas => [ - { label => 'page_view_count', value => 'page_view_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'id_absolute' }, + { label => 'page_view_count', value => 'page_view_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'id' }, ], } }, diff --git a/cloud/microsoft/office365/sharepoint/mode/usersactivity.pm b/cloud/microsoft/office365/sharepoint/mode/usersactivity.pm index d76f56133..f27210261 100644 --- a/cloud/microsoft/office365/sharepoint/mode/usersactivity.pm +++ b/cloud/microsoft/office365/sharepoint/mode/usersactivity.pm @@ -113,7 +113,7 @@ sub set_counters { key_values => [ { name => 'viewed_edited_file_count' } ], output_template => 'Viewed or Edited File Count: %d', perfdatas => [ - { label => 'total_viewed_edited_file_count', value => 'viewed_edited_file_count_absolute', template => '%d', + { label => 'total_viewed_edited_file_count', value => 'viewed_edited_file_count', template => '%d', min => 0 }, ], } @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'synced_file_count' } ], output_template => 'Synced File Count: %d', perfdatas => [ - { label => 'total_synced_file_count', value => 'synced_file_count_absolute', template => '%d', + { label => 'total_synced_file_count', value => 'synced_file_count', template => '%d', min => 0 }, ], } @@ -131,7 +131,7 @@ sub set_counters { key_values => [ { name => 'shared_int_file_count' } ], output_template => 'Shared Internally File Count: %d', perfdatas => [ - { label => 'total_shared_int_file_count', value => 'shared_int_file_count_absolute', template => '%d', + { label => 'total_shared_int_file_count', value => 'shared_int_file_count', template => '%d', min => 0 }, ], } @@ -140,7 +140,7 @@ sub set_counters { key_values => [ { name => 'shared_ext_file_count' } ], output_template => 'Shared Externally File Count: %d', perfdatas => [ - { label => 'total_shared_ext_file_count', value => 'shared_ext_file_count_absolute', template => '%d', + { label => 'total_shared_ext_file_count', value => 'shared_ext_file_count', template => '%d', min => 0 }, ], } @@ -149,7 +149,7 @@ sub set_counters { key_values => [ { name => 'visited_page_count' } ], output_template => 'Visited Page Count (active sites): %d', perfdatas => [ - { label => 'total_visited_page_count', value => 'visited_page_count_absolute', template => '%d', + { label => 'total_visited_page_count', value => 'visited_page_count', template => '%d', min => 0 }, ], } @@ -160,8 +160,8 @@ sub set_counters { key_values => [ { name => 'viewed_edited_file_count' }, { name => 'name' } ], output_template => 'Viewed or Edited File Count: %d', perfdatas => [ - { label => 'viewed_edited_file_count', value => 'viewed_edited_file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'viewed_edited_file_count', value => 'viewed_edited_file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -169,8 +169,8 @@ sub set_counters { key_values => [ { name => 'synced_file_count' }, { name => 'name' } ], output_template => 'Synced File Count: %d', perfdatas => [ - { label => 'synced_file_count', value => 'synced_file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'synced_file_count', value => 'synced_file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -178,8 +178,8 @@ sub set_counters { key_values => [ { name => 'shared_int_file_count' }, { name => 'name' } ], output_template => 'Shared Internally File Count: %d', perfdatas => [ - { label => 'shared_int_file_count', value => 'shared_int_file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'shared_int_file_count', value => 'shared_int_file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -187,8 +187,8 @@ sub set_counters { key_values => [ { name => 'shared_ext_file_count' }, { name => 'name' } ], output_template => 'Shared Externally File Count: %d', perfdatas => [ - { label => 'shared_ext_file_count', value => 'shared_ext_file_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'shared_ext_file_count', value => 'shared_ext_file_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -196,8 +196,8 @@ sub set_counters { key_values => [ { name => 'visited_page_count' }, { name => 'name' } ], output_template => 'Visited Page Count: %d', perfdatas => [ - { label => 'visited_page_count', value => 'visited_page_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'visited_page_count', value => 'visited_page_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/cloud/microsoft/office365/skype/mode/devicesusage.pm b/cloud/microsoft/office365/skype/mode/devicesusage.pm index 9763c2395..a32b1ac55 100644 --- a/cloud/microsoft/office365/skype/mode/devicesusage.pm +++ b/cloud/microsoft/office365/skype/mode/devicesusage.pm @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'windows' } ], output_template => 'Windows: %d', perfdatas => [ - { label => 'windows', value => 'windows_absolute', template => '%d', + { label => 'windows', value => 'windows', template => '%d', min => 0 }, ], } @@ -115,7 +115,7 @@ sub set_counters { key_values => [ { name => 'ipad' } ], output_template => 'iPad: %d', perfdatas => [ - { label => 'ipad', value => 'ipad_absolute', template => '%d', + { label => 'ipad', value => 'ipad', template => '%d', min => 0 }, ], } @@ -124,7 +124,7 @@ sub set_counters { key_values => [ { name => 'iphone' } ], output_template => 'iPhone: %d', perfdatas => [ - { label => 'iphone', value => 'iphone_absolute', template => '%d', + { label => 'iphone', value => 'iphone', template => '%d', min => 0 }, ], } @@ -133,7 +133,7 @@ sub set_counters { key_values => [ { name => 'android_phone' } ], output_template => 'Android Phone: %d', perfdatas => [ - { label => 'android_phone', value => 'android_phone_absolute', template => '%d', + { label => 'android_phone', value => 'android_phone', template => '%d', min => 0 }, ], } @@ -142,7 +142,7 @@ sub set_counters { key_values => [ { name => 'windows_phone' } ], output_template => 'Windows Phone: %d', perfdatas => [ - { label => 'windows_phone', value => 'windows_phone_absolute', template => '%d', + { label => 'windows_phone', value => 'windows_phone', template => '%d', min => 0 }, ], } diff --git a/cloud/microsoft/office365/skype/mode/usersactivity.pm b/cloud/microsoft/office365/skype/mode/usersactivity.pm index 443f2bd32..f7361d085 100644 --- a/cloud/microsoft/office365/skype/mode/usersactivity.pm +++ b/cloud/microsoft/office365/skype/mode/usersactivity.pm @@ -113,7 +113,7 @@ sub set_counters { key_values => [ { name => 'peer_to_peer_sessions' } ], output_template => 'Peer-to-peer Sessions Count: %d', perfdatas => [ - { label => 'total_peer_to_peer_sessions', value => 'peer_to_peer_sessions_absolute', template => '%d', + { label => 'total_peer_to_peer_sessions', value => 'peer_to_peer_sessions', template => '%d', min => 0 }, ], } @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'organized_conference' } ], output_template => 'Organized Conference Count: %d', perfdatas => [ - { label => 'total_organized_conference', value => 'organized_conference_absolute', template => '%d', + { label => 'total_organized_conference', value => 'organized_conference', template => '%d', min => 0 }, ], } @@ -131,7 +131,7 @@ sub set_counters { key_values => [ { name => 'participated_conference' } ], output_template => 'Participated Conference Count: %d', perfdatas => [ - { label => 'total_participated_conference', value => 'participated_conference_absolute', template => '%d', + { label => 'total_participated_conference', value => 'participated_conference', template => '%d', min => 0 }, ], } @@ -142,8 +142,8 @@ sub set_counters { key_values => [ { name => 'peer_to_peer_sessions' }, { name => 'name' } ], output_template => 'Peer-to-peer Sessions Count: %d', perfdatas => [ - { label => 'peer_to_peer_sessions', value => 'peer_to_peer_sessions_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'peer_to_peer_sessions', value => 'peer_to_peer_sessions', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -151,8 +151,8 @@ sub set_counters { key_values => [ { name => 'organized_conference' }, { name => 'name' } ], output_template => 'Organized Conference Count: %d', perfdatas => [ - { label => 'organized_conference', value => 'organized_conference_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'organized_conference', value => 'organized_conference', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -160,8 +160,8 @@ sub set_counters { key_values => [ { name => 'participated_conference' }, { name => 'name' } ], output_template => 'Participated Conference Count: %d', perfdatas => [ - { label => 'participated_conference', value => 'participated_conference_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'participated_conference', value => 'participated_conference', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/cloud/microsoft/office365/teams/mode/devicesusage.pm b/cloud/microsoft/office365/teams/mode/devicesusage.pm index 237069fe2..8edb722b4 100644 --- a/cloud/microsoft/office365/teams/mode/devicesusage.pm +++ b/cloud/microsoft/office365/teams/mode/devicesusage.pm @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'windows' } ], output_template => 'Windows: %d', perfdatas => [ - { label => 'windows', value => 'windows_absolute', template => '%d', + { label => 'windows', value => 'windows', template => '%d', min => 0 }, ], } @@ -115,7 +115,7 @@ sub set_counters { key_values => [ { name => 'mac' } ], output_template => 'Mac: %d', perfdatas => [ - { label => 'mac', value => 'mac_absolute', template => '%d', + { label => 'mac', value => 'mac', template => '%d', min => 0 }, ], } @@ -124,7 +124,7 @@ sub set_counters { key_values => [ { name => 'web' } ], output_template => 'Web: %d', perfdatas => [ - { label => 'web', value => 'web_absolute', template => '%d', + { label => 'web', value => 'web', template => '%d', min => 0 }, ], } @@ -133,7 +133,7 @@ sub set_counters { key_values => [ { name => 'ios' } ], output_template => 'iOS: %d', perfdatas => [ - { label => 'ios', value => 'ios_absolute', template => '%d', + { label => 'ios', value => 'ios', template => '%d', min => 0 }, ], } @@ -142,7 +142,7 @@ sub set_counters { key_values => [ { name => 'android_phone' } ], output_template => 'Android Phone: %d', perfdatas => [ - { label => 'android_phone', value => 'android_phone_absolute', template => '%d', + { label => 'android_phone', value => 'android_phone', template => '%d', min => 0 }, ], } @@ -151,7 +151,7 @@ sub set_counters { key_values => [ { name => 'windows_phone' } ], output_template => 'Windows Phone: %d', perfdatas => [ - { label => 'windows_phone', value => 'windows_phone_absolute', template => '%d', + { label => 'windows_phone', value => 'windows_phone', template => '%d', min => 0 }, ], } diff --git a/cloud/microsoft/office365/teams/mode/usersactivity.pm b/cloud/microsoft/office365/teams/mode/usersactivity.pm index ebeaa6fcb..0d13a29ff 100644 --- a/cloud/microsoft/office365/teams/mode/usersactivity.pm +++ b/cloud/microsoft/office365/teams/mode/usersactivity.pm @@ -113,7 +113,7 @@ sub set_counters { key_values => [ { name => 'team_chat' } ], output_template => 'Team Chat Message Count: %d', perfdatas => [ - { label => 'total_team_chat', value => 'team_chat_absolute', template => '%d', + { label => 'total_team_chat', value => 'team_chat', template => '%d', min => 0 }, ], } @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'private_chat' } ], output_template => 'Private Chat Message Count: %d', perfdatas => [ - { label => 'total_private_chat', value => 'private_chat_absolute', template => '%d', + { label => 'total_private_chat', value => 'private_chat', template => '%d', min => 0 }, ], } @@ -131,7 +131,7 @@ sub set_counters { key_values => [ { name => 'call' } ], output_template => 'Call Count: %d', perfdatas => [ - { label => 'total_call', value => 'call_absolute', template => '%d', + { label => 'total_call', value => 'call', template => '%d', min => 0 }, ], } @@ -140,7 +140,7 @@ sub set_counters { key_values => [ { name => 'meeting' } ], output_template => 'Meeting Count: %d', perfdatas => [ - { label => 'total_meeting', value => 'meeting_absolute', template => '%d', + { label => 'total_meeting', value => 'meeting', template => '%d', min => 0 }, ], } @@ -151,8 +151,8 @@ sub set_counters { key_values => [ { name => 'team_chat' }, { name => 'name' } ], output_template => 'Team Chat Message Count: %d', perfdatas => [ - { label => 'team_chat', value => 'team_chat_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'team_chat', value => 'team_chat', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -160,8 +160,8 @@ sub set_counters { key_values => [ { name => 'private_chat' }, { name => 'name' } ], output_template => 'Private Chat Message Count: %d', perfdatas => [ - { label => 'private_chat', value => 'private_chat_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'private_chat', value => 'private_chat', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -169,8 +169,8 @@ sub set_counters { key_values => [ { name => 'call' }, { name => 'name' } ], output_template => 'Call Count: %d', perfdatas => [ - { label => 'call', value => 'call_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'call', value => 'call', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -178,8 +178,8 @@ sub set_counters { key_values => [ { name => 'meeting' }, { name => 'name' } ], output_template => 'Meeting Count: %d', perfdatas => [ - { label => 'meeting', value => 'meeting_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'meeting', value => 'meeting', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/cloud/nutanix/snmp/mode/clusterusage.pm b/cloud/nutanix/snmp/mode/clusterusage.pm index 9db7dad4c..b0a2c246a 100644 --- a/cloud/nutanix/snmp/mode/clusterusage.pm +++ b/cloud/nutanix/snmp/mode/clusterusage.pm @@ -135,7 +135,7 @@ sub set_counters { key_values => [ { name => 'clusterLatency' } ], output_template => 'Average Latency : %s µs', perfdatas => [ - { label => 'avg_latency', value => 'clusterLatency_absolute', template => '%s', unit => 'µs', + { label => 'avg_latency', value => 'clusterLatency', template => '%s', unit => 'µs', min => 0 }, ], } @@ -144,7 +144,7 @@ sub set_counters { key_values => [ { name => 'clusterIops' } ], output_template => 'IOPs : %s', perfdatas => [ - { label => 'iops', value => 'clusterIops_absolute', template => '%s', unit => 'iops', + { label => 'iops', value => 'clusterIops', template => '%s', unit => 'iops', min => 0 }, ], } diff --git a/cloud/nutanix/snmp/mode/containerusage.pm b/cloud/nutanix/snmp/mode/containerusage.pm index c52cdacac..2f0d612d6 100644 --- a/cloud/nutanix/snmp/mode/containerusage.pm +++ b/cloud/nutanix/snmp/mode/containerusage.pm @@ -112,8 +112,8 @@ sub set_counters { key_values => [ { name => 'citAvgLatencyUsecs' }, { name => 'display' } ], output_template => 'Average Latency : %s µs', perfdatas => [ - { label => 'avg_latency', value => 'citAvgLatencyUsecs_absolute', template => '%s', unit => 'µs', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_latency', value => 'citAvgLatencyUsecs', template => '%s', unit => 'µs', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -121,8 +121,8 @@ sub set_counters { key_values => [ { name => 'citIOPerSecond' }, { name => 'display' } ], output_template => 'IOPs : %s', perfdatas => [ - { label => 'iops', value => 'citIOPerSecond_absolute', template => '%s', unit => 'iops', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'iops', value => 'citIOPerSecond', template => '%s', unit => 'iops', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/nutanix/snmp/mode/diskusage.pm b/cloud/nutanix/snmp/mode/diskusage.pm index 2de3b02d2..df991f939 100644 --- a/cloud/nutanix/snmp/mode/diskusage.pm +++ b/cloud/nutanix/snmp/mode/diskusage.pm @@ -135,8 +135,8 @@ sub set_counters { key_values => [ { name => 'inodes_used' }, { name => 'display' } ], output_template => 'Inodes Used : %s %%', perfdatas => [ - { label => 'inodes', value => 'inodes_used_absolute', template => '%s', unit => '%', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'inodes', value => 'inodes_used', template => '%s', unit => '%', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -144,8 +144,8 @@ sub set_counters { key_values => [ { name => 'dstAverageLatency' }, { name => 'display' } ], output_template => 'Average Latency : %s µs', perfdatas => [ - { label => 'avg_latency', value => 'dstAverageLatency_absolute', template => '%s', unit => 'µs', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_latency', value => 'dstAverageLatency', template => '%s', unit => 'µs', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -153,8 +153,8 @@ sub set_counters { key_values => [ { name => 'dstNumberIops' }, { name => 'display' } ], output_template => 'IOPs : %s', perfdatas => [ - { label => 'iops', value => 'dstNumberIops_absolute', template => '%s', unit => 'iops', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'iops', value => 'dstNumberIops', template => '%s', unit => 'iops', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/nutanix/snmp/mode/hypervisorusage.pm b/cloud/nutanix/snmp/mode/hypervisorusage.pm index 351da7186..94bf109dc 100644 --- a/cloud/nutanix/snmp/mode/hypervisorusage.pm +++ b/cloud/nutanix/snmp/mode/hypervisorusage.pm @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'hypervisorCpuUsagePercent' }, { name => 'display' } ], output_template => 'CPU Usage : %s %%', perfdatas => [ - { label => 'cpu_usage', value => 'hypervisorCpuUsagePercent_absolute', template => '%s', unit => '%', - min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_usage', value => 'hypervisorCpuUsagePercent', template => '%s', unit => '%', + min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -99,8 +99,8 @@ sub set_counters { key_values => [ { name => 'hypervisorAverageLatency' }, { name => 'display' } ], output_template => 'Average Latency : %s µs', perfdatas => [ - { label => 'avg_latency', value => 'hypervisorAverageLatency_absolute', template => '%s', unit => 'µs', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_latency', value => 'hypervisorAverageLatency', template => '%s', unit => 'µs', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -108,8 +108,8 @@ sub set_counters { key_values => [ { name => 'hypervisorReadIOPerSecond' }, { name => 'display' } ], output_template => 'Read IOPs : %s', perfdatas => [ - { label => 'read_iops', value => 'hypervisorReadIOPerSecond_absolute', template => '%s', unit => 'iops', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', value => 'hypervisorReadIOPerSecond', template => '%s', unit => 'iops', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -117,8 +117,8 @@ sub set_counters { key_values => [ { name => 'hypervisorWriteIOPerSecond' }, { name => 'display' } ], output_template => 'Write IOPs : %s', perfdatas => [ - { label => 'write_iops', value => 'hypervisorWriteIOPerSecond_absolute', template => '%s', unit => 'iops', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', value => 'hypervisorWriteIOPerSecond', template => '%s', unit => 'iops', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -126,8 +126,8 @@ sub set_counters { key_values => [ { name => 'hypervisorVmCount' }, { name => 'display' } ], output_template => 'VM Count : %s', perfdatas => [ - { label => 'vm_count', value => 'hypervisorVmCount_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'vm_count', value => 'hypervisorVmCount', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/nutanix/snmp/mode/storagepoolusage.pm b/cloud/nutanix/snmp/mode/storagepoolusage.pm index 5de35cb0d..fc978de86 100644 --- a/cloud/nutanix/snmp/mode/storagepoolusage.pm +++ b/cloud/nutanix/snmp/mode/storagepoolusage.pm @@ -112,8 +112,8 @@ sub set_counters { key_values => [ { name => 'spitAvgLatencyUsecs' }, { name => 'display' } ], output_template => 'Average Latency : %s µs', perfdatas => [ - { label => 'avg_latency', value => 'spitAvgLatencyUsecs_absolute', template => '%s', unit => 'µs', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_latency', value => 'spitAvgLatencyUsecs', template => '%s', unit => 'µs', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -121,8 +121,8 @@ sub set_counters { key_values => [ { name => 'spitIOPerSecond' }, { name => 'display' } ], output_template => 'IOPs : %s', perfdatas => [ - { label => 'iops', value => 'spitIOPerSecond_absolute', template => '%s', unit => 'iops', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'iops', value => 'spitIOPerSecond', template => '%s', unit => 'iops', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/nutanix/snmp/mode/vmusage.pm b/cloud/nutanix/snmp/mode/vmusage.pm index 5e0e94724..dc2550060 100644 --- a/cloud/nutanix/snmp/mode/vmusage.pm +++ b/cloud/nutanix/snmp/mode/vmusage.pm @@ -39,8 +39,8 @@ sub set_counters { key_values => [ { name => 'vmCpuUsagePercent' }, { name => 'display' } ], output_template => 'CPU Usage : %s %%', perfdatas => [ - { label => 'cpu_usage', value => 'vmCpuUsagePercent_absolute', template => '%s', unit => '%', - min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_usage', template => '%s', unit => '%', + min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => 'vmAverageLatency' }, { name => 'display' } ], output_template => 'Average Latency : %s µs', perfdatas => [ - { label => 'avg_latency', value => 'vmAverageLatency_absolute', template => '%s', unit => 'µs', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_latency', template => '%s', unit => 'µs', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -57,8 +57,8 @@ sub set_counters { key_values => [ { name => 'vmReadIOPerSecond' }, { name => 'display' } ], output_template => 'Read IOPs : %s', perfdatas => [ - { label => 'read_iops', value => 'vmReadIOPerSecond_absolute', template => '%s', unit => 'iops', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', template => '%s', unit => 'iops', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -66,28 +66,28 @@ sub set_counters { key_values => [ { name => 'vmWriteIOPerSecond' }, { name => 'display' } ], output_template => 'Write IOPs : %s', perfdatas => [ - { label => 'write_iops', value => 'vmWriteIOPerSecond_absolute', template => '%s', unit => 'iops', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', template => '%s', unit => 'iops', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'vmRxBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'vmRxBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'vmRxBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'vmTxBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'vmTxBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'vmTxBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/ovh/restapi/mode/sms.pm b/cloud/ovh/restapi/mode/sms.pm index 1ade427f3..cb451d56d 100644 --- a/cloud/ovh/restapi/mode/sms.pm +++ b/cloud/ovh/restapi/mode/sms.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'left' }, { name => 'display' } ], output_template => 'SMS left : %s', perfdatas => [ - { label => 'left', value => 'left_absolute', template => '%s', unit => 'sms', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'left', value => 'left', template => '%s', unit => 'sms', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm b/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm index 326d4d68f..8c8ff8439 100644 --- a/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm +++ b/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm @@ -72,8 +72,8 @@ sub set_counters { key_values => [ { name => 'restarts' }, { name => 'perf' } ], output_template => 'Restarts count : %d', perfdatas => [ - { label => 'restarts_count', value => 'restarts_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'restarts_count', value => 'restarts', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, diff --git a/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm b/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm index 4bf008352..910d468ef 100644 --- a/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm +++ b/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active : %d', perfdatas => [ - { label => 'active', value => 'active_absolute', template => '%d', + { label => 'active', value => 'active', template => '%d', min => 0 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'terminating' } ], output_template => 'Terminating : %d', perfdatas => [ - { label => 'terminating', value => 'terminating_absolute', template => '%d', + { label => 'terminating', value => 'terminating', template => '%d', min => 0 }, ], } diff --git a/cloud/prometheus/direct/nginxingresscontroller/mode/connections.pm b/cloud/prometheus/direct/nginxingresscontroller/mode/connections.pm index 8ce95a583..0463d20c1 100644 --- a/cloud/prometheus/direct/nginxingresscontroller/mode/connections.pm +++ b/cloud/prometheus/direct/nginxingresscontroller/mode/connections.pm @@ -38,8 +38,7 @@ sub set_counters { key_values => [ { name => 'reading' } ], output_template => 'Reading: %d', perfdatas => [ - { label => 'reading', value => 'reading_absolute', template => '%d', - min => 0, unit => 'connections' }, + { label => 'reading',template => '%d', min => 0, unit => 'connections' }, ], } }, @@ -47,8 +46,7 @@ sub set_counters { key_values => [ { name => 'waiting' } ], output_template => 'Waiting: %d', perfdatas => [ - { label => 'waiting', value => 'waiting_absolute', template => '%d', - min => 0, unit => 'connections' }, + { label => 'waiting', template => '%d', min => 0, unit => 'connections' }, ], } }, @@ -56,8 +54,7 @@ sub set_counters { key_values => [ { name => 'writing' } ], output_template => 'Writing: %d', perfdatas => [ - { label => 'writing', value => 'writing_absolute', template => '%d', - min => 0, unit => 'connections' }, + { label => 'writing', template => '%d', min => 0, unit => 'connections' }, ], } }, @@ -65,28 +62,23 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active: %d', perfdatas => [ - { label => 'active', value => 'active_absolute', template => '%d', - min => 0, unit => 'connections' }, + { label => 'active', template => '%d', min => 0, unit => 'connections' }, ], } }, { label => 'accepted', nlabel => 'connections.accepted.persecond', set => { - key_values => [ { name => 'accepted', diff => 1 } ], + key_values => [ { name => 'accepted', per_second => 1 } ], output_template => 'Accepted: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'accepted', value => 'accepted_per_second', template => '%.2f', - min => 0, unit => 'connections/s' }, + { label => 'accepted', template => '%.2f', min => 0, unit => 'connections/s' }, ], } }, { label => 'handled', nlabel => 'connections.handled.persecond', set => { - key_values => [ { name => 'handled', diff => 1 } ], + key_values => [ { name => 'handled', per_second => 1 } ], output_template => 'Handled: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'handled', value => 'handled_per_second', template => '%.2f', - min => 0, unit => 'connections/s' }, + { label => 'handled', template => '%.2f', min => 0, unit => 'connections/s' }, ], } }, @@ -105,8 +97,8 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "extra-filter:s@" => { name => 'extra_filter' }, - "metric-overload:s@" => { name => 'metric_overload' }, + 'extra-filter:s@' => { name => 'extra_filter' }, + 'metric-overload:s@' => { name => 'metric_overload' }, }); return $self; diff --git a/cloud/prometheus/direct/nginxingresscontroller/mode/requests.pm b/cloud/prometheus/direct/nginxingresscontroller/mode/requests.pm index b3de6f6ae..af140d00c 100644 --- a/cloud/prometheus/direct/nginxingresscontroller/mode/requests.pm +++ b/cloud/prometheus/direct/nginxingresscontroller/mode/requests.pm @@ -37,54 +37,45 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'requests', nlabel => 'requests.total.persecond', set => { - key_values => [ { name => 'requests', diff => 1 } ], + key_values => [ { name => 'requests', per_second => 1 } ], output_template => 'Requests: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'requests', value => 'requests_per_second', template => '%.2f', - min => 0, unit => 'requests/s' }, + { label => 'requests', template => '%.2f', min => 0, unit => 'requests/s' }, ], } }, ]; + $self->{maps_counters}->{namespaces} = [ { label => 'requests-2xx', nlabel => 'namespace.requests.2xx.persecond', set => { - key_values => [ { name => 'requests_2xx', diff => 1 } ], + key_values => [ { name => 'requests_2xx', per_second => 1 } ], output_template => 'Requests 2xx: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'requests_2xx', value => 'requests_2xx_per_second', template => '%.2f', unit => 'requests/s', - min => 0, label_extra_instance => 1 }, + { label => 'requests_2xx', template => '%.2f', unit => 'requests/s', min => 0, label_extra_instance => 1 }, ], } }, { label => 'requests-3xx', nlabel => 'namespace.requests.2xx.persecond', set => { - key_values => [ { name => 'requests_3xx', diff => 1 } ], + key_values => [ { name => 'requests_3xx', per_second => 1 } ], output_template => 'Requests 3xx: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'requests_3xx', value => 'requests_3xx_per_second', template => '%.2f', unit => 'requests/s', - min => 0, label_extra_instance => 1 }, + { label => 'requests_3xx', template => '%.2f', unit => 'requests/s', min => 0, label_extra_instance => 1 }, ], } }, { label => 'requests-4xx', nlabel => 'namespace.requests.4xx.persecond', set => { - key_values => [ { name => 'requests_4xx', diff => 1 } ], + key_values => [ { name => 'requests_4xx', per_second => 1 } ], output_template => 'Requests 4xx: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'requests_4xx', value => 'requests_4xx_per_second', template => '%.2f', unit => 'requests/s', - min => 0, label_extra_instance => 1 }, + { label => 'requests_4xx', template => '%.2f', unit => 'requests/s', min => 0, label_extra_instance => 1 }, ], } }, { label => 'requests-5xx', nlabel => 'namespace.requests.5xx.persecond', set => { - key_values => [ { name => 'requests_5xx', diff => 1 } ], + key_values => [ { name => 'requests_5xx', per_second => 1 } ], output_template => 'Requests 5xx: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'requests_5xx', value => 'requests_5xx_per_second', template => '%.2f', unit => 'requests/s', - min => 0, label_extra_instance => 1 }, + { label => 'requests_5xx', template => '%.2f', unit => 'requests/s', min => 0, label_extra_instance => 1 }, ], } }, @@ -103,8 +94,8 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "extra-filter:s@" => { name => 'extra_filter' }, - "metric-overload:s@" => { name => 'metric_overload' }, + 'extra-filter:s@' => { name => 'extra_filter' }, + 'metric-overload:s@' => { name => 'metric_overload' }, }); return $self; diff --git a/cloud/prometheus/exporters/cadvisor/mode/cpu.pm b/cloud/prometheus/exporters/cadvisor/mode/cpu.pm index 36004dec3..8068d1747 100644 --- a/cloud/prometheus/exporters/cadvisor/mode/cpu.pm +++ b/cloud/prometheus/exporters/cadvisor/mode/cpu.pm @@ -38,9 +38,9 @@ sub set_counters { key_values => [ { name => 'usage' }, { name => 'container' }, { name => 'pod' }, { name => 'perf' } ], output_template => 'Usage: %.2f %%', perfdatas => [ - { label => 'usage', value => 'usage_absolute', template => '%.2f', + { label => 'usage', value => 'usage', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'perf_absolute' }, + label_extra_instance => 1, instance_use => 'perf' }, ], } }, @@ -48,9 +48,9 @@ sub set_counters { key_values => [ { name => 'throttled' }, { name => 'container' }, { name => 'pod' }, { name => 'perf' } ], output_template => 'Throttled: %.2f %%', perfdatas => [ - { label => 'throttled', value => 'throttled_absolute', template => '%.2f', + { label => 'throttled', value => 'throttled', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'perf_absolute' }, + label_extra_instance => 1, instance_use => 'perf' }, ], } }, diff --git a/cloud/prometheus/exporters/cadvisor/mode/load.pm b/cloud/prometheus/exporters/cadvisor/mode/load.pm index 1a6a3ff8b..459a97f1e 100644 --- a/cloud/prometheus/exporters/cadvisor/mode/load.pm +++ b/cloud/prometheus/exporters/cadvisor/mode/load.pm @@ -39,8 +39,8 @@ sub set_counters { output_template => 'Load: %.2f', output_change_bytes => 1, perfdatas => [ - { label => 'load', value => 'load_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'load', value => 'load', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, diff --git a/cloud/prometheus/exporters/cadvisor/mode/memory.pm b/cloud/prometheus/exporters/cadvisor/mode/memory.pm index b163b6cd2..f67613e33 100644 --- a/cloud/prometheus/exporters/cadvisor/mode/memory.pm +++ b/cloud/prometheus/exporters/cadvisor/mode/memory.pm @@ -131,8 +131,8 @@ sub set_counters { output_template => 'Cache: %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => 'cache', value => 'cache_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'cache', value => 'cache', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'perf' }, ], } }, @@ -141,8 +141,8 @@ sub set_counters { output_template => 'Rss: %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => 'rss', value => 'rss_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'rss', value => 'rss', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'perf' }, ], } }, @@ -151,8 +151,8 @@ sub set_counters { output_template => 'Swap: %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => 'swap', value => 'swap_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'swap', value => 'swap', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'perf' }, ], } }, diff --git a/cloud/prometheus/exporters/cadvisor/mode/taskstate.pm b/cloud/prometheus/exporters/cadvisor/mode/taskstate.pm index 7e68d1b86..9225655a8 100644 --- a/cloud/prometheus/exporters/cadvisor/mode/taskstate.pm +++ b/cloud/prometheus/exporters/cadvisor/mode/taskstate.pm @@ -39,8 +39,8 @@ sub set_counters { output_template => 'Sleeping: %d', output_change_bytes => 1, perfdatas => [ - { label => 'tasks_sleeping', value => 'sleeping_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'tasks_sleeping', value => 'sleeping', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, @@ -49,8 +49,8 @@ sub set_counters { output_template => 'Running: %d', output_change_bytes => 1, perfdatas => [ - { label => 'tasks_running', value => 'running_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'tasks_running', value => 'running', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, @@ -59,8 +59,8 @@ sub set_counters { output_template => 'Stopped: %d', output_change_bytes => 1, perfdatas => [ - { label => 'tasks_stopped', value => 'stopped_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'tasks_stopped', value => 'stopped', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, @@ -69,8 +69,8 @@ sub set_counters { output_template => 'Uninterruptible: %d', output_change_bytes => 1, perfdatas => [ - { label => 'tasks_uninterruptible', value => 'uninterruptible_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'tasks_uninterruptible', value => 'uninterruptible', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, @@ -79,8 +79,8 @@ sub set_counters { output_template => 'Iowaiting: %d', output_change_bytes => 1, perfdatas => [ - { label => 'tasks_iowaiting', value => 'iowaiting_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'perf_absolute' }, + { label => 'tasks_iowaiting', value => 'iowaiting', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'perf' }, ], } }, diff --git a/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm b/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm index 72ca54c35..c6b3d8e52 100644 --- a/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm +++ b/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'node_average' } ], output_template => '%.2f %%', perfdatas => [ - { label => 'node', value => 'node_average_absolute', template => '%.2f', unit => '%', + { label => 'node', value => 'node_average', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'cpu_usage' }, { name => 'display' } ], output_template => 'Usage: %.2f %%', perfdatas => [ - { label => 'cpu', value => 'cpu_usage_absolute', template => '%.2f', unit => '%', + { label => 'cpu', value => 'cpu_usage', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } diff --git a/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm b/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm index 747c547fb..b3dcbf742 100644 --- a/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm +++ b/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'iowait' } ], output_template => 'Wait: %.2f %%', perfdatas => [ - { label => 'wait', value => 'iowait_absolute', template => '%.2f', + { label => 'wait', value => 'iowait', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'user' } ], output_template => 'User: %.2f %%', perfdatas => [ - { label => 'user', value => 'user_absolute', template => '%.2f', + { label => 'user', value => 'user', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'softirq' } ], output_template => 'Soft Irq: %.2f %%', perfdatas => [ - { label => 'softirq', value => 'softirq_absolute', template => '%.2f', + { label => 'softirq', value => 'softirq', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'irq' } ], output_template => 'Interrupt: %.2f %%', perfdatas => [ - { label => 'interrupt', value => 'irq_absolute', template => '%.2f', + { label => 'interrupt', value => 'irq', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -80,7 +80,7 @@ sub set_counters { key_values => [ { name => 'idle' } ], output_template => 'Idle: %.2f %%', perfdatas => [ - { label => 'idle', value => 'idle_absolute', template => '%.2f', + { label => 'idle', value => 'idle', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -89,7 +89,7 @@ sub set_counters { key_values => [ { name => 'steal' } ], output_template => 'Steal: %.2f %%', perfdatas => [ - { label => 'steal', value => 'steal_absolute', template => '%.2f', + { label => 'steal', value => 'steal', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -98,7 +98,7 @@ sub set_counters { key_values => [ { name => 'system' } ], output_template => 'System: %.2f %%', perfdatas => [ - { label => 'system', value => 'system_absolute', template => '%.2f', + { label => 'system', value => 'system', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -107,7 +107,7 @@ sub set_counters { key_values => [ { name => 'nice' } ], output_template => 'Nice: %.2f %%', perfdatas => [ - { label => 'nice', value => 'nice_absolute', template => '%.2f', + { label => 'nice', value => 'nice', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -118,7 +118,7 @@ sub set_counters { key_values => [ { name => 'iowait' }, { name => 'display' } ], output_template => 'Wait: %.2f %%', perfdatas => [ - { label => 'wait', value => 'iowait_absolute', template => '%.2f', + { label => 'wait', value => 'iowait', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -127,7 +127,7 @@ sub set_counters { key_values => [ { name => 'user' }, { name => 'display' } ], output_template => 'User: %.2f %%', perfdatas => [ - { label => 'user', value => 'user_absolute', template => '%.2f', + { label => 'user', value => 'user', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -136,7 +136,7 @@ sub set_counters { key_values => [ { name => 'softirq' }, { name => 'display' } ], output_template => 'Soft Irq: %.2f %%', perfdatas => [ - { label => 'softirq', value => 'softirq_absolute', template => '%.2f', + { label => 'softirq', value => 'softirq', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -145,7 +145,7 @@ sub set_counters { key_values => [ { name => 'irq' }, { name => 'display' } ], output_template => 'Interrupt: %.2f %%', perfdatas => [ - { label => 'interrupt', value => 'irq_absolute', template => '%.2f', + { label => 'interrupt', value => 'irq', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -154,7 +154,7 @@ sub set_counters { key_values => [ { name => 'idle' }, { name => 'display' } ], output_template => 'Idle: %.2f %%', perfdatas => [ - { label => 'idle', value => 'idle_absolute', template => '%.2f', + { label => 'idle', value => 'idle', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -163,7 +163,7 @@ sub set_counters { key_values => [ { name => 'steal' }, { name => 'display' } ], output_template => 'Steal: %.2f %%', perfdatas => [ - { label => 'steal', value => 'steal_absolute', template => '%.2f', + { label => 'steal', value => 'steal', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -172,7 +172,7 @@ sub set_counters { key_values => [ { name => 'system' }, { name => 'display' } ], output_template => 'System: %.2f %%', perfdatas => [ - { label => 'system', value => 'system_absolute', template => '%.2f', + { label => 'system', value => 'system', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -181,7 +181,7 @@ sub set_counters { key_values => [ { name => 'nice' }, { name => 'display' } ], output_template => 'Nice: %.2f %%', perfdatas => [ - { label => 'nice', value => 'nice_absolute', template => '%.2f', + { label => 'nice', value => 'nice', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } diff --git a/cloud/prometheus/exporters/nodeexporter/mode/load.pm b/cloud/prometheus/exporters/nodeexporter/mode/load.pm index 2f511c482..cde0cf25c 100644 --- a/cloud/prometheus/exporters/nodeexporter/mode/load.pm +++ b/cloud/prometheus/exporters/nodeexporter/mode/load.pm @@ -38,8 +38,8 @@ sub set_counters { output_template => 'Load 1 minute: %.2f', output_change_bytes => 1, perfdatas => [ - { label => 'load1', value => 'load1_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load1', value => 'load1', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -48,8 +48,8 @@ sub set_counters { output_template => 'Load 5 minutes: %.2f', output_change_bytes => 1, perfdatas => [ - { label => 'load5', value => 'load5_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load5', value => 'load5', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -58,8 +58,8 @@ sub set_counters { output_template => 'Load 15 minutes: %.2f', output_change_bytes => 1, perfdatas => [ - { label => 'load15', value => 'load15_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load15', value => 'load15', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/prometheus/exporters/nodeexporter/mode/memory.pm b/cloud/prometheus/exporters/nodeexporter/mode/memory.pm index 3a0c4ab2b..6fdacbfae 100644 --- a/cloud/prometheus/exporters/nodeexporter/mode/memory.pm +++ b/cloud/prometheus/exporters/nodeexporter/mode/memory.pm @@ -109,8 +109,8 @@ sub set_counters { output_template => 'Buffer: %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => 'buffer', value => 'buffer_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'buffer', value => 'buffer', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -119,8 +119,8 @@ sub set_counters { output_template => 'Cached: %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => 'cached', value => 'cached_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cached', value => 'cached', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/cloud/prometheus/restapi/mode/targetstatus.pm b/cloud/prometheus/restapi/mode/targetstatus.pm index 6f6d83ae8..9e48ddc2c 100644 --- a/cloud/prometheus/restapi/mode/targetstatus.pm +++ b/cloud/prometheus/restapi/mode/targetstatus.pm @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active: %s', perfdatas => [ - { label => 'active_targets', value => 'active_absolute', template => '%s', + { label => 'active_targets', value => 'active', template => '%s', min => 0 }, ], } @@ -80,7 +80,7 @@ sub set_counters { key_values => [ { name => 'dropped' } ], output_template => 'Dropped: %s', perfdatas => [ - { label => 'dropped_targets', value => 'dropped_absolute', template => '%s', + { label => 'dropped_targets', value => 'dropped', template => '%s', min => 0 }, ], } @@ -89,7 +89,7 @@ sub set_counters { key_values => [ { name => 'up' } ], output_template => 'Up: %s', perfdatas => [ - { label => 'up_targets', value => 'up_absolute', template => '%s', + { label => 'up_targets', value => 'up', template => '%s', min => 0 }, ], } @@ -98,7 +98,7 @@ sub set_counters { key_values => [ { name => 'down' } ], output_template => 'Down: %s', perfdatas => [ - { label => 'down_targets', value => 'down_absolute', template => '%s', + { label => 'down_targets', value => 'down', template => '%s', min => 0 }, ], } @@ -107,7 +107,7 @@ sub set_counters { key_values => [ { name => 'unknown' } ], output_template => 'Unknown: %s', perfdatas => [ - { label => 'unknown_targets', value => 'unknown_absolute', template => '%s', + { label => 'unknown_targets', value => 'unknown', template => '%s', min => 0 }, ], } diff --git a/cloud/vmware/velocloud/restapi/mode/applicationusage.pm b/cloud/vmware/velocloud/restapi/mode/applicationusage.pm index 22d9c7fb7..6ee4f7d92 100644 --- a/cloud/vmware/velocloud/restapi/mode/applicationusage.pm +++ b/cloud/vmware/velocloud/restapi/mode/applicationusage.pm @@ -44,7 +44,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic In: %s %s/s', perfdatas => [ - { value => 'traffic_in_absolute', template => '%s', + { value => 'traffic_in', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -54,7 +54,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic Out: %s %s/s', perfdatas => [ - { value => 'traffic_out_absolute', template => '%s', + { value => 'traffic_out', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'packets_in' }, { name => 'display' }, { name => 'id' } ], output_template => 'Packets In: %.2f packets/s', perfdatas => [ - { value => 'packets_in_absolute', template => '%.2f', + { value => 'packets_in', template => '%.2f', min => 0, unit => 'packets/s', label_extra_instance => 1 }, ], } @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'packets_out' }, { name => 'display' }, { name => 'id' } ], output_template => 'Packets Out: %.2f packets/s', perfdatas => [ - { value => 'packets_out_absolute', template => '%.2f', + { value => 'packets_out', template => '%.2f', min => 0, unit => 'packets/s', label_extra_instance => 1 }, ], } diff --git a/cloud/vmware/velocloud/restapi/mode/categoryusage.pm b/cloud/vmware/velocloud/restapi/mode/categoryusage.pm index e1ead2619..6759143d7 100644 --- a/cloud/vmware/velocloud/restapi/mode/categoryusage.pm +++ b/cloud/vmware/velocloud/restapi/mode/categoryusage.pm @@ -44,7 +44,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic In: %s %s/s', perfdatas => [ - { value => 'traffic_in_absolute', template => '%s', + { value => 'traffic_in', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -54,7 +54,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic Out: %s %s/s', perfdatas => [ - { value => 'traffic_out_absolute', template => '%s', + { value => 'traffic_out', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'packets_in' }, { name => 'display' }, { name => 'id' } ], output_template => 'Packets In: %.2f packets/s', perfdatas => [ - { value => 'packets_in_absolute', template => '%.2f', + { value => 'packets_in', template => '%.2f', min => 0, unit => 'packets/s', label_extra_instance => 1 }, ], } @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'packets_out' }, { name => 'display' }, { name => 'id' } ], output_template => 'Packets Out: %.2f packets/s', perfdatas => [ - { value => 'packets_out_absolute', template => '%.2f', + { value => 'packets_out', template => '%.2f', min => 0, unit => 'packets/s', label_extra_instance => 1 }, ], } diff --git a/cloud/vmware/velocloud/restapi/mode/edgeqoe.pm b/cloud/vmware/velocloud/restapi/mode/edgeqoe.pm index 709f4ec46..485c7023f 100644 --- a/cloud/vmware/velocloud/restapi/mode/edgeqoe.pm +++ b/cloud/vmware/velocloud/restapi/mode/edgeqoe.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'voice' } ], output_template => 'Voice QOE: %s', perfdatas => [ - { value => 'voice_absolute', template => '%s', + { value => 'voice', template => '%s', min => 0, max => 10, label_extra_instance => 1 }, ], } @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'video' } ], output_template => 'Video QOE: %s', perfdatas => [ - { value => 'video_absolute', template => '%s', + { value => 'video', template => '%s', min => 0, max => 10, label_extra_instance => 1 }, ], } @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'transactional' } ], output_template => 'Transactional QOE: %s', perfdatas => [ - { value => 'transactional_absolute', template => '%s', + { value => 'transactional', template => '%s', min => 0, max => 10, label_extra_instance => 1 }, ], } @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'voice' }, { name => 'display' }, { name => 'id' } ], output_template => 'Voice QOE: %s', perfdatas => [ - { value => 'voice_absolute', template => '%s', + { value => 'voice', template => '%s', min => 0, max => 10, label_extra_instance => 1 }, ], } @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'video' }, { name => 'display' }, { name => 'id' } ], output_template => 'Video QOE: %s', perfdatas => [ - { value => 'video_absolute', template => '%s', + { value => 'video', template => '%s', min => 0, max => 10, label_extra_instance => 1 }, ], } @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => 'transactional' }, { name => 'display' }, { name => 'id' } ], output_template => 'Transactional QOE: %s', perfdatas => [ - { value => 'transactional_absolute', template => '%s', + { value => 'transactional', template => '%s', min => 0, max => 10, label_extra_instance => 1 }, ], } diff --git a/cloud/vmware/velocloud/restapi/mode/linkusage.pm b/cloud/vmware/velocloud/restapi/mode/linkusage.pm index e7274f071..b662014f1 100644 --- a/cloud/vmware/velocloud/restapi/mode/linkusage.pm +++ b/cloud/vmware/velocloud/restapi/mode/linkusage.pm @@ -45,7 +45,7 @@ sub set_counters { output_template => 'Total Traffic In: %s %s/s', output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_absolute', template => '%s', + { value => 'traffic_in', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -55,7 +55,7 @@ sub set_counters { output_template => 'Total Traffic Out: %s %s/s', output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_absolute', template => '%s', + { value => 'traffic_out', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -68,7 +68,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic In: %s %s/s', perfdatas => [ - { value => 'traffic_in_absolute', template => '%s', + { value => 'traffic_in', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -78,7 +78,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Traffic Out: %s %s/s', perfdatas => [ - { value => 'traffic_out_absolute', template => '%s', + { value => 'traffic_out', template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1 }, ], } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'latency_in' }, { name => 'display' }, { name => 'id' } ], output_template => 'Latency In: %.2f ms', perfdatas => [ - { value => 'latency_in_absolute', template => '%.2f', + { value => 'latency_in', template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1 }, ], } @@ -96,7 +96,7 @@ sub set_counters { key_values => [ { name => 'latency_out' }, { name => 'display' }, { name => 'id' } ], output_template => 'Latency Out: %.2f ms', perfdatas => [ - { value => 'latency_out_absolute', template => '%.2f', + { value => 'latency_out', template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1 }, ], } @@ -105,7 +105,7 @@ sub set_counters { key_values => [ { name => 'jitter_in' }, { name => 'display' }, { name => 'id' } ], output_template => 'Jitter In: %.2f ms', perfdatas => [ - { value => 'jitter_in_absolute', template => '%.2f', + { value => 'jitter_in', template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1 }, ], } @@ -114,7 +114,7 @@ sub set_counters { key_values => [ { name => 'jitter_out' }, { name => 'display' }, { name => 'id' } ], output_template => 'Jitter Out: %.2f ms', perfdatas => [ - { value => 'jitter_out_absolute', template => '%.2f', + { value => 'jitter_out', template => '%.2f', min => 0, unit => 'ms', label_extra_instance => 1 }, ], } @@ -123,7 +123,7 @@ sub set_counters { key_values => [ { name => 'packet_loss_in' }, { name => 'display' }, { name => 'id' } ], output_template => 'Packet Loss In: %.2f%%', perfdatas => [ - { value => 'packet_loss_in_absolute', template => '%.2f', + { value => 'packet_loss_in', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -132,7 +132,7 @@ sub set_counters { key_values => [ { name => 'packet_loss_out' }, { name => 'display' }, { name => 'id' } ], output_template => 'Packet Loss Out: %.2f%%', perfdatas => [ - { value => 'packet_loss_out_absolute', template => '%.2f', + { value => 'packet_loss_out', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } diff --git a/database/cassandra/jmx/mode/clientrequestsusage.pm b/database/cassandra/jmx/mode/clientrequestsusage.pm index 878b0f375..9c9da1374 100644 --- a/database/cassandra/jmx/mode/clientrequestsusage.pm +++ b/database/cassandra/jmx/mode/clientrequestsusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'TotalLatency_Count', diff => 1 }, { name => 'display' } ], output_template => 'Total Latency : %s us', perfdatas => [ - { label => 'total_latency', value => 'TotalLatency_Count_absolute', template => '%s', - min => 0, unit => 'us', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_latency', value => 'TotalLatency_Count', template => '%s', + min => 0, unit => 'us', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'Timeouts_Count', diff => 1 }, { name => 'display' } ], output_template => 'Timeouts : %s', perfdatas => [ - { label => 'timeouts', value => 'Timeouts_Count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'timeouts', value => 'Timeouts_Count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'Unavailables_Count', diff => 1 }, { name => 'display' } ], output_template => 'Unavailables : %s', perfdatas => [ - { label => 'unavailbles', value => 'Unavailables_Count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'unavailbles', value => 'Unavailables_Count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'Failures_Count', diff => 1 }, { name => 'display' } ], output_template => 'Failures : %s', perfdatas => [ - { label => 'failures', value => 'Failures_Count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'failures', value => 'Failures_Count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/cassandra/jmx/mode/threadpoolsusage.pm b/database/cassandra/jmx/mode/threadpoolsusage.pm index ad5c06cf2..16e2cc225 100644 --- a/database/cassandra/jmx/mode/threadpoolsusage.pm +++ b/database/cassandra/jmx/mode/threadpoolsusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'ActiveTasks_Value' }, { name => 'display' } ], output_template => 'Current Active Tasks : %s', perfdatas => [ - { label => 'active_tasks', value => 'ActiveTasks_Value_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'active_tasks', value => 'ActiveTasks_Value', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'PendingTasks_Value' }, { name => 'display' } ], output_template => 'Current Pending Tasks : %s', perfdatas => [ - { label => 'pending_tasks', value => 'PendingTasks_Value_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'pending_tasks', value => 'PendingTasks_Value', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'CompletedTasks_Value', diff => 1 }, { name => 'display' } ], output_template => 'Total Completed Tasks : %s', perfdatas => [ - { label => 'total_completed_tasks', value => 'CompletedTasks_Value_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_completed_tasks', value => 'CompletedTasks_Value', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'TotalBlockedTasks_Count', diff => 1 }, { name => 'display' } ], output_template => 'Total Blocked Tasks : %s', perfdatas => [ - { label => 'total_blocked_tasks', value => 'TotalBlockedTasks_Count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_blocked_tasks', value => 'TotalBlockedTasks_Count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'CurrentlyBlockedTasks_Count', diff => 1 }, { name => 'display' } ], output_template => 'Currently Blocked Tasks : %s', perfdatas => [ - { label => 'current_blocked_tasks', value => 'CurrentlyBlockedTasks_Count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_blocked_tasks', value => 'CurrentlyBlockedTasks_Count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/couchdb/restapi/mode/server.pm b/database/couchdb/restapi/mode/server.pm index 24159549a..0e58d4836 100644 --- a/database/couchdb/restapi/mode/server.pm +++ b/database/couchdb/restapi/mode/server.pm @@ -74,8 +74,8 @@ sub set_counters { output_template => 'live data size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'sizes_active_absolute', template => '%d', min => 0, - unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'sizes_active', template => '%d', min => 0, + unit => 'B', label_extra_instance => 1, instance_use => 'display' } ], } }, @@ -84,8 +84,8 @@ sub set_counters { output_template => 'file size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'sizes_file_absolute', template => '%d', min => 0, - unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'sizes_file', template => '%d', min => 0, + unit => 'B', label_extra_instance => 1, instance_use => 'display' } ], } }, @@ -93,8 +93,8 @@ sub set_counters { key_values => [ { name => 'doc_count' }, { name => 'display' } ], output_template => 'number of documents: %s', perfdatas => [ - { value => 'doc_count_absolute', template => '%d', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'doc_count', template => '%d', min => 0, + label_extra_instance => 1, instance_use => 'display' } ], } }, @@ -102,8 +102,8 @@ sub set_counters { key_values => [ { name => 'doc_del_count' }, { name => 'display' } ], output_template => 'number of deleted documents: %s', perfdatas => [ - { value => 'doc_del_count_absolute', template => '%d', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'doc_del_count', template => '%d', min => 0, + label_extra_instance => 1, instance_use => 'display' } ], } }, diff --git a/database/elasticsearch/restapi/mode/clusterstatistics.pm b/database/elasticsearch/restapi/mode/clusterstatistics.pm index 1e5215f61..8d5c99c3c 100644 --- a/database/elasticsearch/restapi/mode/clusterstatistics.pm +++ b/database/elasticsearch/restapi/mode/clusterstatistics.pm @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'nodes_total' } ], output_template => 'Nodes: %d', perfdatas => [ - { value => 'nodes_total_absolute', template => '%d', + { value => 'nodes_total', template => '%d', min => 0 }, ], } @@ -70,8 +70,8 @@ sub set_counters { key_values => [ { name => 'nodes_data' }, { name => 'nodes_total' } ], output_template => 'Nodes Data: %d', perfdatas => [ - { value => 'nodes_data_absolute', template => '%d', - min => 0, max => 'nodes_total_absolute' }, + { value => 'nodes_data', template => '%d', + min => 0, max => 'nodes_total' }, ], } }, @@ -79,8 +79,8 @@ sub set_counters { key_values => [ { name => 'nodes_coordinating' }, { name => 'nodes_total' } ], output_template => 'Nodes Coordinating: %d', perfdatas => [ - { value => 'nodes_coordinating_absolute', template => '%d', - min => 0, max => 'nodes_total_absolute' }, + { value => 'nodes_coordinating', template => '%d', + min => 0, max => 'nodes_total' }, ], } }, @@ -88,8 +88,8 @@ sub set_counters { key_values => [ { name => 'nodes_master' }, { name => 'nodes_total' } ], output_template => 'Nodes Master: %d', perfdatas => [ - { value => 'nodes_master_absolute', template => '%d', - min => 0, max => 'nodes_total_absolute' }, + { value => 'nodes_master', template => '%d', + min => 0, max => 'nodes_total' }, ], } }, @@ -97,8 +97,8 @@ sub set_counters { key_values => [ { name => 'nodes_ingest' }, { name => 'nodes_total' } ], output_template => 'Nodes Ingest: %d', perfdatas => [ - { value => 'nodes_ingest_absolute', template => '%d', - min => 0, max => 'nodes_total_absolute' }, + { value => 'nodes_ingest', template => '%d', + min => 0, max => 'nodes_total' }, ], } }, @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'indices_count' } ], output_template => 'Indices: %d', perfdatas => [ - { value => 'indices_count_absolute', template => '%d', + { value => 'indices_count', template => '%d', min => 0 }, ], } @@ -115,7 +115,7 @@ sub set_counters { key_values => [ { name => 'shards_total' } ], output_template => 'Shards: %d', perfdatas => [ - { value => 'shards_total_absolute', template => '%d', + { value => 'shards_total', template => '%d', min => 0 }, ], } @@ -124,8 +124,8 @@ sub set_counters { key_values => [ { name => 'shards_active' } ], output_template => 'Shards Active: %d', perfdatas => [ - { value => 'shards_active_absolute', template => '%d', - min => 0, max => 'shards_total_absolute' }, + { value => 'shards_active', template => '%d', + min => 0, max => 'shards_total' }, ], } }, @@ -133,7 +133,7 @@ sub set_counters { key_values => [ { name => 'active_shards_percent' } ], output_template => 'Shards Active: %.2f%%', perfdatas => [ - { value => 'active_shards_percent_absolute', template => '%.2f', + { value => 'active_shards_percent', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -142,8 +142,8 @@ sub set_counters { key_values => [ { name => 'shards_unassigned' }, { name => 'shards_total' } ], output_template => 'Shards Unassigned: %d', perfdatas => [ - { value => 'shards_unassigned_absolute', template => '%d', - min => 0, max => 'shards_total_absolute' }, + { value => 'shards_unassigned', template => '%d', + min => 0, max => 'shards_total' }, ], } }, @@ -151,8 +151,8 @@ sub set_counters { key_values => [ { name => 'shards_relocating' }, { name => 'shards_total' } ], output_template => 'Shards Relocating: %d', perfdatas => [ - { value => 'shards_relocating_absolute', template => '%d', - min => 0, max => 'shards_total_absolute' }, + { value => 'shards_relocating', template => '%d', + min => 0, max => 'shards_total' }, ], } }, @@ -160,8 +160,8 @@ sub set_counters { key_values => [ { name => 'shards_initializing' }, { name => 'shards_total' } ], output_template => 'Shards Initializing: %d', perfdatas => [ - { value => 'shards_initializing_absolute', template => '%d', - min => 0, max => 'shards_total_absolute' }, + { value => 'shards_initializing', template => '%d', + min => 0, max => 'shards_total' }, ], } }, @@ -169,7 +169,7 @@ sub set_counters { key_values => [ { name => 'tasks_pending' } ], output_template => 'Tasks Pending: %d', perfdatas => [ - { value => 'tasks_pending_absolute', template => '%d', + { value => 'tasks_pending', template => '%d', min => 0 }, ], } @@ -178,7 +178,7 @@ sub set_counters { key_values => [ { name => 'docs_count' } ], output_template => 'Documents: %d', perfdatas => [ - { value => 'docs_count_absolute', template => '%d', + { value => 'docs_count', template => '%d', min => 0 }, ], } @@ -188,7 +188,7 @@ sub set_counters { output_template => 'Data: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'size_in_bytes_absolute', template => '%s', + { value => 'size_in_bytes', template => '%s', min => 0, unit => 'B' }, ], } diff --git a/database/elasticsearch/restapi/mode/indicestatistics.pm b/database/elasticsearch/restapi/mode/indicestatistics.pm index 34d5690b2..ff60fdb99 100644 --- a/database/elasticsearch/restapi/mode/indicestatistics.pm +++ b/database/elasticsearch/restapi/mode/indicestatistics.pm @@ -60,8 +60,8 @@ sub set_counters { key_values => [ { name => 'docs_count' }, { name => 'display' } ], output_template => 'Documents: %d', perfdatas => [ - { value => 'docs_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'docs_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -70,8 +70,8 @@ sub set_counters { output_template => 'Data Primaries: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'size_in_bytes_primaries_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'size_in_bytes_primaries', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -80,8 +80,8 @@ sub set_counters { output_template => 'Data Total: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'size_in_bytes_total_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'size_in_bytes_total', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -89,8 +89,8 @@ sub set_counters { key_values => [ { name => 'shards_active' }, { name => 'display' } ], output_template => 'Shards Active: %d', perfdatas => [ - { value => 'shards_active_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'shards_active', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -98,8 +98,8 @@ sub set_counters { key_values => [ { name => 'shards_unassigned' }, { name => 'display' } ], output_template => 'Shards Unassigned: %d', perfdatas => [ - { value => 'shards_unassigned_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'shards_unassigned', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/elasticsearch/restapi/mode/nodestatistics.pm b/database/elasticsearch/restapi/mode/nodestatistics.pm index bf404f74b..f040bf4b0 100644 --- a/database/elasticsearch/restapi/mode/nodestatistics.pm +++ b/database/elasticsearch/restapi/mode/nodestatistics.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'heap_used_percent' }, { name => 'display' } ], output_template => 'JVM Heap: %d%%', perfdatas => [ - { value => 'heap_used_percent_absolute', template => '%d', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'heap_used_percent', template => '%d', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -48,9 +48,9 @@ sub set_counters { output_template => 'JVM Heap Bytes: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'heap_used_in_bytes_absolute', template => '%s', - min => 0, max => 'heap_max_in_bytes_absolute', unit => 'B', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { value => 'heap_used_in_bytes', template => '%s', + min => 0, max => 'heap_max_in_bytes', unit => 'B', label_extra_instance => 1, + instance_use => 'display' }, ], } }, @@ -60,9 +60,9 @@ sub set_counters { output_template => 'Free Disk Space: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'available_in_bytes_absolute', template => '%s', - min => 0, max => 'total_in_bytes_absolute', unit => 'B', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'available_in_bytes', template => '%s', + min => 0, max => 'total_in_bytes', unit => 'B', + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -70,8 +70,8 @@ sub set_counters { key_values => [ { name => 'docs_count' }, { name => 'display' } ], output_template => 'Documents: %d', perfdatas => [ - { value => 'docs_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'docs_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -80,8 +80,8 @@ sub set_counters { output_template => 'Data: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'size_in_bytes_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'size_in_bytes', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/firebird/mode/pages.pm b/database/firebird/mode/pages.pm index 6d1600014..0921d6177 100644 --- a/database/firebird/mode/pages.pm +++ b/database/firebird/mode/pages.pm @@ -35,42 +35,34 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'reads', nlabel => 'pages.reads.persecond', set => { - key_values => [ { name => 'reads', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'reads', per_second => 1 } ], output_template => 'Reads : %.2f', perfdatas => [ - { label => 'reads', template => '%.2f', value => 'reads_per_second', - unit => '/s', min => 0 }, + { label => 'reads', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'writes', nlabel => 'pages.writes.persecond', set => { - key_values => [ { name => 'writes', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'writes', per_second => 1 } ], output_template => 'Writes : %.2f', perfdatas => [ - { label => 'writes', template => '%.2f', value => 'writes_per_second', - unit => '/s', min => 0 }, + { label => 'writes', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'fetches', nlabel => 'pages.fetches.persecond', set => { - key_values => [ { name => 'fetches', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'fetches', per_second => 1 } ], output_template => 'Fetches : %.2f', perfdatas => [ - { label => 'fetches', template => '%.2f', value => 'fetches_per_second', - unit => '/s', min => 0 }, + { label => 'fetches', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'marks', nlabel => 'pages.marks.persecond', set => { - key_values => [ { name => 'marks', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'marks', per_second => 1 } ], output_template => 'Marks : %.2f', perfdatas => [ - { label => 'marks', template => '%.2f', value => 'marks_per_second', - unit => '/s', min => 0 }, + { label => 'marks', template => '%.2f', unit => '/s', min => 0 }, ], } }, diff --git a/database/firebird/mode/queries.pm b/database/firebird/mode/queries.pm index a37a8f550..e582e4e38 100644 --- a/database/firebird/mode/queries.pm +++ b/database/firebird/mode/queries.pm @@ -35,82 +35,66 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'total', nlabel => 'queries.total.persecond', set => { - key_values => [ { name => 'total', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'total', per_second => 1 } ], output_template => 'Total : %d', perfdatas => [ - { label => 'total', template => '%d', value => 'total_per_second', - unit => '/s', min => 0 }, + { label => 'total', template => '%d', unit => '/s', min => 0 }, ], } }, { label => 'seq-reads', nlabel => 'queries.sequentialreads.persecond', set => { - key_values => [ { name => 'seq_reads', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'seq_reads', per_second => 1 } ], output_template => 'Seq Reads : %d', perfdatas => [ - { label => 'seq_reads', template => '%d', value => 'seq_reads_per_second', - unit => '/s', min => 0 }, + { label => 'seq_reads', template => '%d', unit => '/s', min => 0 }, ], } }, { label => 'inserts', nlabel => 'queries.insert.persecond', set => { - key_values => [ { name => 'inserts', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'inserts', per_second => 1 } ], output_template => 'Inserts : %d', perfdatas => [ - { label => 'inserts', template => '%d', value => 'inserts_per_second', - unit => '/s', min => 0 }, + { label => 'inserts', template => '%d', unit => '/s', min => 0 }, ], } }, { label => 'updates', nlabel => 'queries.updates.persecond', set => { - key_values => [ { name => 'updates', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'updates', per_second => 1 } ], output_template => 'Updates : %d', perfdatas => [ - { label => 'updates', template => '%d', value => 'updates_per_second', - unit => '/s', min => 0 }, + { label => 'updates', template => '%d', unit => '/s', min => 0 }, ], } }, { label => 'deletes', nlabel => 'queries.deletes.persecond', set => { - key_values => [ { name => 'deletes', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'deletes', per_second => 1 } ], output_template => 'Deletes : %d', perfdatas => [ - { label => 'deletes', template => '%d', value => 'deletes_per_second', - unit => '/s', min => 0 }, + { label => 'deletes', template => '%d', unit => '/s', min => 0 }, ], } }, { label => 'backouts', nlabel => 'queries.backout.persecond', set => { - key_values => [ { name => 'backouts', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'backouts', per_second => 1 } ], output_template => 'Backouts : %d', perfdatas => [ - { label => 'backouts', template => '%d', value => 'backouts_per_second', - unit => '/s', min => 0 }, + { label => 'backouts', template => '%d', unit => '/s', min => 0 }, ], } }, { label => 'purges', nlabel => 'queries.purges.persecond', set => { - key_values => [ { name => 'purges', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'purges', per_second => 1 } ], output_template => 'Purges : %d', perfdatas => [ - { label => 'purges', template => '%d', value => 'purges_per_second', - unit => '/s', min => 0 }, + { label => 'purges', template => '%d', unit => '/s', min => 0 }, ], } }, { label => 'expunges', nlabel => 'queries.expunges.persecond', set => { - key_values => [ { name => 'expunges', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'expunges', per_second => 1 } ], output_template => 'Expunges : %d', perfdatas => [ - { label => 'expunges', template => '%d', value => 'expunges_per_second', - unit => '/s', min => 0 }, + { label => 'expunges', template => '%d', unit => '/s', min => 0 }, ], } }, diff --git a/database/influxdb/mode/connectiontime.pm b/database/influxdb/mode/connectiontime.pm index 36b291870..6cae9f4a5 100644 --- a/database/influxdb/mode/connectiontime.pm +++ b/database/influxdb/mode/connectiontime.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'connection_time' } ], output_template => 'Connection established in %d ms', perfdatas => [ - { value => 'connection_time_absolute', template => '%d', unit => 'ms', + { value => 'connection_time', template => '%d', unit => 'ms', min => 0 }, ], } diff --git a/database/influxdb/mode/databasestatistics.pm b/database/influxdb/mode/databasestatistics.pm index 1898e6ca4..9c5ac3d02 100644 --- a/database/influxdb/mode/databasestatistics.pm +++ b/database/influxdb/mode/databasestatistics.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'numMeasurements' }, { name => 'display' } ], output_template => 'Measurements: %s', perfdatas => [ - { value => 'numMeasurements_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'numMeasurements', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'numSeries' }, { name => 'display' } ], output_template => 'Series: %s', perfdatas => [ - { value => 'numSeries_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'numSeries', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/influxdb/mode/httpserverstatistics.pm b/database/influxdb/mode/httpserverstatistics.pm index 855f8d324..261e42170 100644 --- a/database/influxdb/mode/httpserverstatistics.pm +++ b/database/influxdb/mode/httpserverstatistics.pm @@ -35,38 +35,34 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'requests-query-count', nlabel => 'requests.query.count.persecond', set => { - key_values => [ { name => 'queryReq', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'queryReq', per_second => 1 } ], output_template => 'Query Requests: %.2f/s', perfdatas => [ - { value => 'queryReq_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'requests-write-count', nlabel => 'requests.write.count.persecond', set => { - key_values => [ { name => 'writeReq', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'writeReq', per_second => 1 } ], output_template => 'Write Requests: %.2f/s', perfdatas => [ - { value => 'writeReq_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'requests-ping-count', nlabel => 'requests.ping.count.persecond', set => { - key_values => [ { name => 'pingReq', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pingReq', per_second => 1 } ], output_template => 'Ping Requests: %.2f/s', perfdatas => [ - { value => 'pingReq_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'requests-status-count', nlabel => 'requests.status.count.persecond', set => { - key_values => [ { name => 'statusReq', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'statusReq', per_second => 1 } ], output_template => 'Status Requests: %.2f/s', perfdatas => [ - { value => 'statusReq_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, @@ -74,7 +70,7 @@ sub set_counters { key_values => [ { name => 'reqActive' } ], output_template => 'Active Requests: %d', perfdatas => [ - { value => 'reqActive_absolute', template => '%d', min => 0 }, + { template => '%d', min => 0 }, ], } }, @@ -82,48 +78,44 @@ sub set_counters { key_values => [ { name => 'writeReqActive' } ], output_template => 'Active Write Requests: %d', perfdatas => [ - { value => 'writeReqActive_absolute', template => '%d', min => 0 }, + { template => '%d', min => 0 }, ], } }, { label => 'requests-response-data', nlabel => 'requests.response.data.bytes', set => { - key_values => [ { name => 'queryRespBytes', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'queryRespBytes', per_second => 1 } ], output_change_bytes => 1, output_template => 'Response Data: %s%s/s', perfdatas => [ - { value => 'queryRespBytes_per_second', template => '%s', min => 0, unit => 'B/s' }, + { template => '%s', min => 0, unit => 'B/s' }, ], } }, { label => 'requests-write-data', nlabel => 'requests.write.data.bytes', set => { - key_values => [ { name => 'writeReqBytes', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'writeReqBytes', per_second => 1 } ], output_change_bytes => 1, output_template => 'Write Data: %s%s/s', perfdatas => [ - { value => 'writeReqBytes_per_second', template => '%s', min => 0, unit => 'B/s' }, + { template => '%s', min => 0, unit => 'B/s' }, ], } }, { label => 'errors-server', nlabel => 'errors.server.persecond', set => { - key_values => [ { name => 'serverError', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'serverError', per_second => 1 } ], output_template => 'Server Errors: %.2f/s', perfdatas => [ - { value => 'serverError_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'errors-client', nlabel => 'errors.client.persecond', set => { - key_values => [ { name => 'clientError', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'clientError', per_second => 1 } ], output_template => 'Client Errors: %.2f/s', perfdatas => [ - { value => 'clientError_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } - }, + } ]; } diff --git a/database/influxdb/mode/writestatistics.pm b/database/influxdb/mode/writestatistics.pm index 4f02a9b2a..26370dcf0 100644 --- a/database/influxdb/mode/writestatistics.pm +++ b/database/influxdb/mode/writestatistics.pm @@ -35,47 +35,42 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'points-written', nlabel => 'points.written.persecond', set => { - key_values => [ { name => 'pointReq', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'pointReq', per_second => 1 } ], output_template => 'Points Written: %.2f/s', perfdatas => [ - { value => 'pointReq_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'writes-ok', nlabel => 'writes.ok.persecond', set => { - key_values => [ { name => 'writeOk', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'writeOk', per_second => 1 } ], output_template => 'Writes Ok: %.2f/s', perfdatas => [ - { value => 'writeOk_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'writes-error', nlabel => 'writes.error.persecond', set => { - key_values => [ { name => 'writeError', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'writeError', per_second => 1 } ], output_template => 'Writes Error: %.2f/s', perfdatas => [ - { value => 'writeError_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'writes-drop', nlabel => 'writes.drop.persecond', set => { - key_values => [ { name => 'writeDrop', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'writeDrop', per_second => 1 } ], output_template => 'Writes Drop: %.2f/s', perfdatas => [ - { value => 'writeDrop_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, { label => 'writes-timeout', nlabel => 'writes.timeout.persecond', set => { - key_values => [ { name => 'writeTimeout', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'writeTimeout', per_second => 1 } ], output_template => 'Writes Timeout: %.2f/s', perfdatas => [ - { value => 'writeTimeout_per_second', template => '%.2f', min => 0 }, + { template => '%.2f', min => 0 }, ], } }, diff --git a/database/informix/snmp/mode/archivelevel0.pm b/database/informix/snmp/mode/archivelevel0.pm index 729bb77ad..b335e2973 100644 --- a/database/informix/snmp/mode/archivelevel0.pm +++ b/database/informix/snmp/mode/archivelevel0.pm @@ -38,10 +38,10 @@ sub set_counters { { label => 'time', set => { key_values => [ { name => 'seconds' }, { name => 'date'}, { name => 'display' } ], output_template => "archive level0 last execution date '%s'", - output_use => 'date_absolute', + output_use => 'date', perfdatas => [ - { label => 'seconds', value => 'seconds_absolute', template => '%s', min => 0, unit => 's', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'seconds', value => 'seconds', template => '%s', min => 0, unit => 's', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/informix/snmp/mode/dbspaceusage.pm b/database/informix/snmp/mode/dbspaceusage.pm index 054a43fbb..97f092837 100644 --- a/database/informix/snmp/mode/dbspaceusage.pm +++ b/database/informix/snmp/mode/dbspaceusage.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Used: %.2f%%', perfdatas => [ - { label => 'used', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/informix/snmp/mode/globalcache.pm b/database/informix/snmp/mode/globalcache.pm index f3394a735..5d372d352 100644 --- a/database/informix/snmp/mode/globalcache.pm +++ b/database/informix/snmp/mode/globalcache.pm @@ -53,7 +53,7 @@ sub set_counters { threshold_use => 'prct', output_use => 'prct', perfdatas => [ { label => 'read', value => 'prct', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -64,7 +64,7 @@ sub set_counters { threshold_use => 'prct', output_use => 'prct', perfdatas => [ { label => 'write', value => 'prct', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/informix/snmp/mode/lockstats.pm b/database/informix/snmp/mode/lockstats.pm index a302da7ec..46a279e2e 100644 --- a/database/informix/snmp/mode/lockstats.pm +++ b/database/informix/snmp/mode/lockstats.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'onServerDeadLocks', diff => 1 }, { name => 'display' } ], output_template => 'Deadlocks %d', perfdatas => [ - { label => 'lock_dead', value => 'onServerDeadLocks_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'lock_dead', value => 'onServerDeadLocks', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'onServerLockWaits', diff => 1 }, { name => 'display' } ], output_template => 'Lock Waits %d', perfdatas => [ - { label => 'lock_wait', value => 'onServerLockWaits_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'lock_wait', value => 'onServerLockWaits', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'onServerLockRequests', diff => 1 }, { name => 'display' } ], output_template => 'Lock Requests %d', perfdatas => [ - { label => 'lock_request', value => 'onServerLockRequests_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'lock_request', value => 'onServerLockRequests', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'onServerLockTimeouts', diff => 1 }, { name => 'display' } ], output_template => 'Lock Timeouts %d', perfdatas => [ - { label => 'lock_timeout', value => 'onServerLockTimeouts_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'lock_timeout', value => 'onServerLockTimeouts', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/informix/snmp/mode/logfileusage.pm b/database/informix/snmp/mode/logfileusage.pm index 8f86139dd..a56f62319 100644 --- a/database/informix/snmp/mode/logfileusage.pm +++ b/database/informix/snmp/mode/logfileusage.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Log Files Used: %.2f%%', perfdatas => [ - { label => 'used', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/informix/snmp/mode/sessions.pm b/database/informix/snmp/mode/sessions.pm index eb0c9e062..b0f3dff24 100644 --- a/database/informix/snmp/mode/sessions.pm +++ b/database/informix/snmp/mode/sessions.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'sessions' }, { name => 'display' } ], output_template => '%d client sessions', perfdatas => [ - { label => 'sessions', value => 'sessions_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'sessions', value => 'sessions', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/mongodb/mode/collectionstatistics.pm b/database/mongodb/mode/collectionstatistics.pm index 7f6e54d7f..61377dca4 100644 --- a/database/mongodb/mode/collectionstatistics.pm +++ b/database/mongodb/mode/collectionstatistics.pm @@ -44,7 +44,7 @@ sub set_counters { output_template => 'Storage Size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'storageSize_absolute', template => '%s', + { value => 'storageSize', template => '%s', min => 0, unit => 'B', label_extra_instance => 1 }, ], } @@ -54,7 +54,7 @@ sub set_counters { output_template => 'Index Size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'totalIndexSize_absolute', template => '%s', + { value => 'totalIndexSize', template => '%s', min => 0, unit => 'B', label_extra_instance => 1 }, ], } @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'count' }, { name => 'display' } ], output_template => 'Documents: %s', perfdatas => [ - { value => 'count_absolute', template => '%s', + { value => 'count', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'nindexes' }, { name => 'display' } ], output_template => 'Indexes: %s', perfdatas => [ - { value => 'nindexes_absolute', template => '%s', + { value => 'nindexes', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/database/mongodb/mode/connections.pm b/database/mongodb/mode/connections.pm index 54fd88821..69e63448a 100644 --- a/database/mongodb/mode/connections.pm +++ b/database/mongodb/mode/connections.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active: %d', perfdatas => [ - { value => 'active_absolute', template => '%d', min => 0, unit => 'conn' }, + { template => '%d', min => 0, unit => 'conn' }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'Current: %d', perfdatas => [ - { value => 'current_absolute', template => '%d', min => 0, unit => 'conn' }, + { template => '%d', min => 0, unit => 'conn' }, ], } }, @@ -54,16 +54,15 @@ sub set_counters { key_values => [ { name => 'usage' } ], output_template => 'Usage: %.2f %%', perfdatas => [ - { value => 'usage_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, { label => 'total-created', nlabel => 'connections.created.persecond', set => { - key_values => [ { name => 'totalCreated', diff => 1 } ], + key_values => [ { name => 'totalCreated', per_second => 1 } ], output_template => 'Created: %.2f/s', - per_second => 1, perfdatas => [ - { value => 'totalCreated_per_second', template => '%.2f', min => 0, unit => 'conn/s' }, + { template => '%.2f', min => 0, unit => 'conn/s' }, ], } }, diff --git a/database/mongodb/mode/connectiontime.pm b/database/mongodb/mode/connectiontime.pm index fd3dee309..85bffac65 100644 --- a/database/mongodb/mode/connectiontime.pm +++ b/database/mongodb/mode/connectiontime.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'connection_time' } ], output_template => 'Connection established in %d ms', perfdatas => [ - { value => 'connection_time_absolute', template => '%d', unit => 'ms', + { value => 'connection_time', template => '%d', unit => 'ms', min => 0 }, ], } diff --git a/database/mongodb/mode/databasestatistics.pm b/database/mongodb/mode/databasestatistics.pm index fd10ea8f7..8c4eda3e5 100644 --- a/database/mongodb/mode/databasestatistics.pm +++ b/database/mongodb/mode/databasestatistics.pm @@ -39,8 +39,8 @@ sub set_counters { output_template => 'Storage Size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'storageSize_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'storageSize', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -49,8 +49,8 @@ sub set_counters { output_template => 'Data Size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'dataSize_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'dataSize', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -59,8 +59,8 @@ sub set_counters { output_template => 'Index Size: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'indexSize_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'indexSize', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -68,8 +68,8 @@ sub set_counters { key_values => [ { name => 'collections' }, { name => 'display' } ], output_template => 'Collections: %s', perfdatas => [ - { value => 'collections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'collections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -77,8 +77,8 @@ sub set_counters { key_values => [ { name => 'views' }, { name => 'display' } ], output_template => 'Views: %s', perfdatas => [ - { value => 'views_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'views', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -86,8 +86,8 @@ sub set_counters { key_values => [ { name => 'documents' }, { name => 'display' } ], output_template => 'Documents: %s', perfdatas => [ - { value => 'documents_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'documents', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -95,8 +95,8 @@ sub set_counters { key_values => [ { name => 'indexes' }, { name => 'display' } ], output_template => 'Indexes: %s', perfdatas => [ - { value => 'indexes_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'indexes', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/mongodb/mode/queries.pm b/database/mongodb/mode/queries.pm index fea4d56c0..3ff9af843 100644 --- a/database/mongodb/mode/queries.pm +++ b/database/mongodb/mode/queries.pm @@ -35,11 +35,10 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'total', nlabel => 'queries.total.persecond', set => { - key_values => [ { name => 'total', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'total', per_second => 1 } ], output_template => 'Total : %d', perfdatas => [ - { value => 'total_per_second', template => '%d', unit => '/s', min => 0 }, + { template => '%d', unit => '/s', min => 0 }, ], } }, @@ -48,12 +47,11 @@ sub set_counters { foreach ('insert', 'query', 'update', 'delete', 'getmore', 'command') { push @{$self->{maps_counters}->{global}}, { label => $_, nlabel => 'queries.' . $_ . '.persecond', display_ok => 0, set => { - key_values => [ { name => $_, diff => 1 } ], - per_second => 1, + key_values => [ { name => $_, per_second => 1 } ], output_template => $_ . ' : %.2f', perfdatas => [ - { value => $_ . '_per_second',template => '%.2f', unit => '/s', min => 0 }, - ], + { template => '%.2f', unit => '/s', min => 0 } + ] } }; push @{$self->{maps_counters}->{global}}, { @@ -61,8 +59,8 @@ sub set_counters { key_values => [ { name => $_, diff => 1 } ], output_template => $_ . ' count : %d', perfdatas => [ - { value => $_ . '_absolute', template => '%d', min => 0 }, - ], + { template => '%d', min => 0 } + ] } }; } diff --git a/database/mongodb/mode/replicationstatus.pm b/database/mongodb/mode/replicationstatus.pm index 03ae69a14..cf6bec9cf 100644 --- a/database/mongodb/mode/replicationstatus.pm +++ b/database/mongodb/mode/replicationstatus.pm @@ -108,8 +108,8 @@ sub set_counters { key_values => [ { name => 'lag' }, { name => 'name' } ], output_template => 'Replication Lag: %s s', perfdatas => [ - { value => 'lag_absolute', template => '%d', unit => 's', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { value => 'lag', template => '%d', unit => 's', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/database/mssql/mode/blockedprocesses.pm b/database/mssql/mode/blockedprocesses.pm index 44c0d5cfb..638409996 100644 --- a/database/mssql/mode/blockedprocesses.pm +++ b/database/mssql/mode/blockedprocesses.pm @@ -40,7 +40,7 @@ sub set_counters { key_values => [ { name => 'blocked_processes' } ], output_template => 'Number of blocked processes : %s', perfdatas => [ - { label => 'blocked_processes', value => 'blocked_processes_absolute', template => '%s', + { label => 'blocked_processes', value => 'blocked_processes', template => '%s', unit => '', min => 0 }, ], } diff --git a/database/mssql/mode/pagelifeexpectancy.pm b/database/mssql/mode/pagelifeexpectancy.pm index e70468ce4..4380ba53d 100644 --- a/database/mssql/mode/pagelifeexpectancy.pm +++ b/database/mssql/mode/pagelifeexpectancy.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'page_life_expectancy'}], output_template => 'Page life expectancy : %d second(s)', perfdatas => [ - { value => 'page_life_expectancy_absolute', template => '%d', unit => 's', min => 0 }, + { value => 'page_life_expectancy', template => '%d', unit => 's', min => 0 }, ] }} ]; diff --git a/database/mysql/mode/databasessize.pm b/database/mysql/mode/databasessize.pm index a9cc517e4..270abd318 100644 --- a/database/mysql/mode/databasessize.pm +++ b/database/mysql/mode/databasessize.pm @@ -47,7 +47,7 @@ sub set_counters { output_template => 'Used Space: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'used_absolute', template => '%s', unit => 'B', + { value => 'used', template => '%s', unit => 'B', min => 0 }, ], } @@ -57,7 +57,7 @@ sub set_counters { output_template => 'Free Space: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'free_absolute', template => '%s', unit => 'B', + { value => 'free', template => '%s', unit => 'B', min => 0 }, ], } @@ -70,7 +70,7 @@ sub set_counters { output_template => 'Used: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'used_absolute', template => '%s', unit => 'B', + { value => 'used', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 }, ], } @@ -80,7 +80,7 @@ sub set_counters { output_template => 'Free: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'free_absolute', template => '%s', unit => 'B', + { value => 'free', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 }, ], } @@ -93,7 +93,7 @@ sub set_counters { output_template => 'Used: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'used_absolute', template => '%s', unit => 'B', + { value => 'used', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 }, ], } @@ -103,7 +103,7 @@ sub set_counters { output_template => 'Free: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'free_absolute', template => '%s', unit => 'B', + { value => 'free', template => '%s', unit => 'B', min => 0, label_extra_instance => 1 }, ], } @@ -112,7 +112,7 @@ sub set_counters { key_values => [ { name => 'frag' }, { name => 'display' } ], output_template => 'Fragmentation: %.2f %%', perfdatas => [ - { value => 'frag_absolute', template => '%.2f', unit => '%', + { value => 'frag', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } diff --git a/database/mysql/mode/queries.pm b/database/mysql/mode/queries.pm index bc154861d..e4bfcfce3 100644 --- a/database/mysql/mode/queries.pm +++ b/database/mysql/mode/queries.pm @@ -35,12 +35,10 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'total', nlabel => 'queries.total.persecond', set => { - key_values => [ { name => 'Queries', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'Queries', per_second => 1 } ], output_template => 'Total : %d', perfdatas => [ - { label => 'total_requests', template => '%d', value => 'Queries_per_second', - unit => '/s', min => 0 }, + { label => 'total_requests', template => '%d', unit => '/s', min => 0 }, ], } }, @@ -49,13 +47,11 @@ sub set_counters { foreach ('update', 'delete', 'insert', 'truncate', 'select', 'commit', 'begin') { push @{$self->{maps_counters}->{global}}, { label => $_, nlabel => 'queries.' . $_ . '.persecond', display_ok => 0, set => { - key_values => [ { name => 'Com_' . $_, diff => 1 } ], - per_second => 1, + key_values => [ { name => 'Com_' . $_, per_second => 1 } ], output_template => $_ . ' : %d', perfdatas => [ - { label => $_ . '_requests', template => '%d', value => 'Com_' . $_ . '_per_second', - unit => '/s', min => 0 }, - ], + { label => $_ . '_requests', template => '%d', unit => '/s', min => 0 } + ] } }; push @{$self->{maps_counters}->{global}}, { @@ -63,9 +59,8 @@ sub set_counters { key_values => [ { name => 'Com_' . $_, diff => 1 } ], output_template => $_ . ' count : %d', perfdatas => [ - { label => $_ . '_count', template => '%d', value => 'Com_' . $_ . '_absolute', - min => 0 }, - ], + { label => $_ . '_count', template => '%d', min => 0 } + ] } }; } diff --git a/database/mysql/mode/threadsconnected.pm b/database/mysql/mode/threadsconnected.pm index 34858d322..6528a1d61 100644 --- a/database/mysql/mode/threadsconnected.pm +++ b/database/mysql/mode/threadsconnected.pm @@ -29,11 +29,11 @@ sub custom_usage_output { my ($self, %options) = @_; my $msg = sprintf("Client Connection Threads Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", - $self->{result_values}->{total_absolute}, - $self->{result_values}->{used_absolute}, - $self->{result_values}->{prct_used_absolute}, - $self->{result_values}->{free_absolute}, - $self->{result_values}->{prct_free_absolute}); + $self->{result_values}->{total}, + $self->{result_values}->{used}, + $self->{result_values}->{prct_used}, + $self->{result_values}->{free}, + $self->{result_values}->{prct_free}); return $msg; } @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'threads_connected', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute' }, + { label => 'threads_connected', value => 'used', template => '%d', min => 0, max => 'total' }, ], } }, @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Client Connection Threads Used : %.2f %%', perfdatas => [ - { label => 'threads_connected_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { label => 'threads_connected_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/database/oracle/mode/datafilesstatus.pm b/database/oracle/mode/datafilesstatus.pm index 46b8b8fea..36eac375a 100644 --- a/database/oracle/mode/datafilesstatus.pm +++ b/database/oracle/mode/datafilesstatus.pm @@ -69,8 +69,8 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'total-traffic', nlabel => 'datafiles.traffic.io.usage.iops', set => { key_values => [], + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), - per_second => 1, manual_keys => 1, threshold_use => 'traffic', output_use => 'traffic', output_template => 'Total Traffic IOPs %.2f', perfdatas => [ @@ -86,7 +86,7 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'online-status', threshold => 0, set => { @@ -94,7 +94,7 @@ sub set_counters { closure_custom_calc => $self->can('custom_online_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, ]; @@ -133,14 +133,14 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-tablespace:s" => { name => 'filter_tablespace' }, - "filter-data-file:s" => { name => 'filter_data_file' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} =~ /offline|invalid/i' }, - "warning-online-status:s" => { name => 'warning_online_status', default => '%{online_status} =~ /sysoff/i' }, - "critical-online-status:s" => { name => 'critical_online_status', default => '%{online_status} =~ /offline|recover/i' }, + 'filter-tablespace:s' => { name => 'filter_tablespace' }, + 'filter-data-file:s' => { name => 'filter_data_file' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} =~ /offline|invalid/i' }, + 'warning-online-status:s' => { name => 'warning_online_status', default => '%{online_status} =~ /sysoff/i' }, + 'critical-online-status:s' => { name => 'critical_online_status', default => '%{online_status} =~ /offline|recover/i' } }); - + return $self; } diff --git a/database/oracle/mode/dataguard.pm b/database/oracle/mode/dataguard.pm index 431622058..7cee5e996 100644 --- a/database/oracle/mode/dataguard.pm +++ b/database/oracle/mode/dataguard.pm @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'lag_minutes' } ], output_template => 'dataguard standby lag %d minutes: %s', perfdatas => [ - { value => 'lag_minutes_absolute', template => '%s', min => 0, unit => 'm' }, + { value => 'lag_minutes', template => '%s', min => 0, unit => 'm' }, ], } }, diff --git a/database/oracle/mode/eventwaitsusage.pm b/database/oracle/mode/eventwaitsusage.pm index a55a1ceeb..5f56f48cd 100644 --- a/database/oracle/mode/eventwaitsusage.pm +++ b/database/oracle/mode/eventwaitsusage.pm @@ -40,25 +40,23 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Event Wait Count : %s events', perfdatas => [ - { label => 'event_wait_count', value => 'count_absolute', template => '%s', min => 0 } + { label => 'event_wait_count', template => '%s', min => 0 } ], } }, ]; $self->{maps_counters}->{event} = [ { label => 'total-waits-sec', set => { - key_values => [ { name => 'total_waits', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'total_waits', per_second => 1 }, { name => 'display' } ], output_template => 'Total Waits : %.2f/s', perfdatas => [ - { label => 'total_waits', value => 'total_waits_per_second', template => '%.2f', - unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_waits', template => '%.2f', + unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'total-waits-time', set => { key_values => [ { name => 'time_waited_micro', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_usage_calc'), output_template => 'Total Waits Time : %.2f %%', output_use => 'prct_wait', threshold_use => 'prct_wait', perfdatas => [ @@ -86,9 +84,9 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "wait-time-min:s" => { name => 'wait_time_min', default => 1000 }, - "show-details" => { name => 'show_details' } + 'filter-name:s' => { name => 'filter_name' }, + 'wait-time-min:s' => { name => 'wait_time_min', default => 1000 }, + 'show-details' => { name => 'show_details' } }); return $self; diff --git a/database/oracle/mode/frausage.pm b/database/oracle/mode/frausage.pm index ad50d37f7..f97fdd29b 100644 --- a/database/oracle/mode/frausage.pm +++ b/database/oracle/mode/frausage.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'percent_space_usage' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { value => 'percent_space_usage_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'percent_space_usage', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'percent_space_reclaimable' }, { name => 'display' } ], output_template => 'reclaimable : %.2f %%', perfdatas => [ - { value => 'percent_space_reclaimable_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'percent_space_reclaimable', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/oracle/mode/invalidobject.pm b/database/oracle/mode/invalidobject.pm index 10b3626ff..60cac7bee 100644 --- a/database/oracle/mode/invalidobject.pm +++ b/database/oracle/mode/invalidobject.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'invalid_objects' } ], output_template => 'objects : %s', perfdatas => [ - { label => 'invalid_objects', value => 'invalid_objects_absolute', template => '%d', min => 0 }, + { label => 'invalid_objects', value => 'invalid_objects', template => '%d', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'invalid_indexes' } ], output_template => 'indexes : %s', perfdatas => [ - { label => 'invalid_indexes', value => 'invalid_indexes_absolute', template => '%d', min => 0 }, + { label => 'invalid_indexes', value => 'invalid_indexes', template => '%d', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'invalid_ind_partitions' } ], output_template => 'index partitions : %s', perfdatas => [ - { label => 'invalid_ind_partitions', value => 'invalid_ind_partitions_absolute', template => '%d', min => 0 }, + { label => 'invalid_ind_partitions', value => 'invalid_ind_partitions', template => '%d', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'invalid_ind_subpartitions' } ], output_template => 'index subpartitions : %s', perfdatas => [ - { label => 'invalid_ind_subpartitions', value => 'invalid_ind_subpartitions_absolute', template => '%d', min => 0 }, + { label => 'invalid_ind_subpartitions', value => 'invalid_ind_subpartitions', template => '%d', min => 0 }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'invalid_registry_components' } ], output_template => 'registry components : %s', perfdatas => [ - { label => 'invalid_registry_components', value => 'invalid_registry_components_absolute', template => '%d', min => 0 }, + { label => 'invalid_registry_components', value => 'invalid_registry_components', template => '%d', min => 0 }, ], } }, diff --git a/database/oracle/mode/librarycacheusage.pm b/database/oracle/mode/librarycacheusage.pm index 684483845..08cf8db4b 100644 --- a/database/oracle/mode/librarycacheusage.pm +++ b/database/oracle/mode/librarycacheusage.pm @@ -75,23 +75,21 @@ sub set_counters { } }, { label => 'reloads', nlabel => 'library.cache.reloads.persecond', set => { - key_values => [ { name => 'reloads', diff => 1 }, ], - per_second => 1, + key_values => [ { name => 'reloads', per_second => 1 }, ], output_template => 'reloads %.2f/s', perfdatas => [ - { label => 'reloads', value => 'reloads_per_second', template => '%.2f', min => 0, unit => '/s' }, + { label => 'reloads', template => '%.2f', min => 0, unit => '/s' }, ], } }, { label => 'invalids', nlabel => 'library.cache.invalids.persecond', set => { - key_values => [ { name => 'invalids', diff => 1 }, ], - per_second => 1, + key_values => [ { name => 'invalids', per_second => 1 }, ], output_template => 'invalids %.2f/s', perfdatas => [ - { label => 'invalids', value => 'invalids_per_second', template => '%.2f', min => 0, unit => '/s' }, + { label => 'invalids', template => '%.2f', min => 0, unit => '/s' }, ], } - }, + } ]; } diff --git a/database/oracle/mode/redologusage.pm b/database/oracle/mode/redologusage.pm index 12109aa1e..3f9ec3fb6 100644 --- a/database/oracle/mode/redologusage.pm +++ b/database/oracle/mode/redologusage.pm @@ -40,7 +40,7 @@ sub set_counters { my ($self, %options) = @_; $self->{maps_counters_type} = [ - { name => 'global', cb_prefix_output => 'prefix_global_output', type => 0 }, + { name => 'global', cb_prefix_output => 'prefix_global_output', type => 0 } ]; $self->{maps_counters}->{global} = [ @@ -50,19 +50,19 @@ sub set_counters { output_template => 'retry ratio %.2f%%', output_use => 'retry_ratio', threshold_use => 'retry_ratio', perfdatas => [ - { label => 'retry_ratio', value => 'retry_ratio', template => '%.2f', min => 0, max => 100, unit => '%' }, - ], + { label => 'retry_ratio', value => 'retry_ratio', template => '%.2f', min => 0, max => 100, unit => '%' } + ] } }, { label => 'traffic-io', nlabel => 'redolog.traffic.io.bytespersecond', set => { - key_values => [ { name => 'redo_size', diff => 1 } ], - output_change_bytes => 1, per_second => 1, + key_values => [ { name => 'redo_size', per_second => 1 } ], + output_change_bytes => 1, output_template => 'traffic io %s %s/s', perfdatas => [ - { label => 'traffic_io', value => 'redo_size_per_second', template => '%s', min => 0, unit => 'B/s' }, - ], + { label => 'traffic_io', template => '%s', min => 0, unit => 'B/s' } + ] } - }, + } ]; } diff --git a/database/oracle/mode/rollbacksegmentusage.pm b/database/oracle/mode/rollbacksegmentusage.pm index 515abb564..fd027b4ca 100644 --- a/database/oracle/mode/rollbacksegmentusage.pm +++ b/database/oracle/mode/rollbacksegmentusage.pm @@ -35,22 +35,18 @@ sub set_counters { $self->{maps_counters}->{segment} = [ { label => 'extends', set => { - key_values => [ { name => 'extends', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'extends', per_second => 1 } ], output_template => 'Extends : %.2f/s', perfdatas => [ - { label => 'extends', value => 'extends_per_second', template => '%.2f', - unit => '/s', min => 0 }, + { label => 'extends', template => '%.2f', unit => '/s', min => 0 }, ], } }, { label => 'wraps', set => { - key_values => [ { name => 'wraps', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'wraps', per_second => 1 } ], output_template => 'Wraps : %.2f/s', perfdatas => [ - { label => 'wraps', value => 'wraps_per_second', template => '%.2f', - unit => '/s', min => 0 }, + { label => 'wraps', template => '%.2f', unit => '/s', min => 0 }, ], } }, diff --git a/database/postgres/mode/databasesize.pm b/database/postgres/mode/databasesize.pm index 39f1f80d1..cb077a36a 100644 --- a/database/postgres/mode/databasesize.pm +++ b/database/postgres/mode/databasesize.pm @@ -38,8 +38,8 @@ sub set_counters { output_template => 'size : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'size', value => 'size_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'size', value => 'size', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/postgres/mode/statistics.pm b/database/postgres/mode/statistics.pm index c6abe9518..5eda9a284 100644 --- a/database/postgres/mode/statistics.pm +++ b/database/postgres/mode/statistics.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'commit', diff => 1 } ], output_template => 'Commit : %s', perfdatas => [ - { label => 'commit', value => 'commit_absolute', template => '%s', min => 0 }, + { label => 'commit', value => 'commit', template => '%s', min => 0 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'rollback', diff => 1 } ], output_template => 'Rollback : %s', perfdatas => [ - { label => 'rollback', value => 'rollback_absolute', template => '%s', min => 0 }, + { label => 'rollback', value => 'rollback', template => '%s', min => 0 }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'insert', diff => 1 } ], output_template => 'Insert : %s', perfdatas => [ - { label => 'insert', value => 'insert_absolute', template => '%s', min => 0 }, + { label => 'insert', value => 'insert', template => '%s', min => 0 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'update', diff => 1 } ], output_template => 'Update : %s', perfdatas => [ - { label => 'update', value => 'update_absolute', template => '%s', min => 0 }, + { label => 'update', value => 'update', template => '%s', min => 0 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'delete', diff => 1 } ], output_template => 'Delete : %s', perfdatas => [ - { label => 'delete', value => 'delete_absolute', template => '%s', min => 0 }, + { label => 'delete', value => 'delete', template => '%s', min => 0 }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'commit', diff => 1 }, { name => 'name' }, ], output_template => 'Commit : %s', perfdatas => [ - { label => 'commit', value => 'commit_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'commit', value => 'commit', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -91,8 +91,8 @@ sub set_counters { key_values => [ { name => 'rollback', diff => 1 }, { name => 'name' }, ], output_template => 'Rollback : %s', perfdatas => [ - { label => 'rollback', value => 'rollback_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'rollback', value => 'rollback', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -100,8 +100,8 @@ sub set_counters { key_values => [ { name => 'insert', diff => 1 }, { name => 'name' }, ], output_template => 'Insert : %s', perfdatas => [ - { label => 'insert', value => 'insert_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'insert', value => 'insert', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -109,8 +109,8 @@ sub set_counters { key_values => [ { name => 'update', diff => 1 }, { name => 'name' }, ], output_template => 'Update : %s', perfdatas => [ - { label => 'update', value => 'update_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'update', value => 'update', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -118,8 +118,8 @@ sub set_counters { key_values => [ { name => 'delete', diff => 1 }, { name => 'name' }, ], output_template => 'Delete : %s', perfdatas => [ - { label => 'delete', value => 'delete_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'delete', value => 'delete', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/database/sap/hana/mode/blockedtransactions.pm b/database/sap/hana/mode/blockedtransactions.pm index bf74f7c25..055464492 100644 --- a/database/sap/hana/mode/blockedtransactions.pm +++ b/database/sap/hana/mode/blockedtransactions.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Current Total Blocked Transactions : %s', perfdatas => [ - { label => 'total_blocked_transactions', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'total_blocked_transactions', value => 'total', template => '%s', min => 0 }, ], } }, diff --git a/database/sap/hana/mode/connectedusers.pm b/database/sap/hana/mode/connectedusers.pm index f3bcc22e4..55726a002 100644 --- a/database/sap/hana/mode/connectedusers.pm +++ b/database/sap/hana/mode/connectedusers.pm @@ -36,8 +36,8 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'display' } ], output_template => 'Connected Users : %s', perfdatas => [ - { label => 'users', value => 'total_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'users', value => 'total', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/sap/hana/mode/hostcpu.pm b/database/sap/hana/mode/hostcpu.pm index e0d821f9f..978b6a60c 100644 --- a/database/sap/hana/mode/hostcpu.pm +++ b/database/sap/hana/mode/hostcpu.pm @@ -39,7 +39,7 @@ sub set_counters { output_template => 'User %.2f %%', output_use => 'user_prct', threshold_use => 'user_prct', perfdatas => [ { label => 'user', value => 'user_prct', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -49,7 +49,7 @@ sub set_counters { output_template => 'System %.2f %%', output_use => 'sys_prct', threshold_use => 'sys_prct', perfdatas => [ { label => 'sys', value => 'sys_prct', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -59,7 +59,7 @@ sub set_counters { output_template => 'Wait %.2f %%', output_use => 'wait_prct', threshold_use => 'wait_prct', perfdatas => [ { label => 'wait', value => 'wait_prct', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { output_template => 'Idle %.2f %%', output_use => 'idle_prct', threshold_use => 'idle_prct', perfdatas => [ { label => 'idle', value => 'idle_prct', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/database/warp10/sensision/mode/fetchstatistics.pm b/database/warp10/sensision/mode/fetchstatistics.pm index dea0bf039..c4f841404 100644 --- a/database/warp10/sensision/mode/fetchstatistics.pm +++ b/database/warp10/sensision/mode/fetchstatistics.pm @@ -40,18 +40,15 @@ sub set_counters { key_values => [ { name => 'calls', diff => 1 }, { name => 'display' } ], output_template => 'Calls: %d', perfdatas => [ - { value => 'calls_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'calls-persecond', nlabel => 'fetch.calls.persecond', set => { - key_values => [ { name => 'calls', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'calls', per_second => 1 }, { name => 'display' } ], output_template => 'Calls (per second): %.2f', perfdatas => [ - { value => 'calls_per_second', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%.2f', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -60,18 +57,16 @@ sub set_counters { output_template => 'Bytes Values: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'bytes_values_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'bytes-values-persecond', nlabel => 'fetch.bytes.values.bytespersecond', set => { - key_values => [ { name => 'bytes_values', diff => 1 }, { name => 'display' } ], - output_change_bytes => 1, per_second => 1, + key_values => [ { name => 'bytes_values', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 1, output_template => 'Bytes Values (per second): %s%s/s', perfdatas => [ - { value => 'bytes_values_per_second', template => '%s', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -80,18 +75,16 @@ sub set_counters { output_template => 'Bytes Keys: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'bytes_keys_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'bytes-keys-persecond', nlabel => 'fetch.bytes.keys.bytespersecond', set => { - key_values => [ { name => 'bytes_keys', diff => 1 }, { name => 'display' } ], - output_change_bytes => 1, per_second => 1, + key_values => [ { name => 'bytes_keys', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 1, output_template => 'Bytes Keys (per second): %s%s/s', perfdatas => [ - { value => 'bytes_keys_per_second', template => '%s', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -99,18 +92,15 @@ sub set_counters { key_values => [ { name => 'datapoints', diff => 1 }, { name => 'display' } ], output_template => 'Datapoints: %d', perfdatas => [ - { value => 'datapoints_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'datapoints-persecond', nlabel => 'fetch.datapoints.persecond', set => { - key_values => [ { name => 'datapoints', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'datapoints', per_second => 1 }, { name => 'display' } ], output_template => 'Datapoints (per second): %.2f', perfdatas => [ - { value => 'datapoints_per_second', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%.2f', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -129,9 +119,9 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, + 'filter-name:s' => { name => 'filter_name' } }); - + return $self; } diff --git a/database/warp10/sensision/mode/scriptstatistics.pm b/database/warp10/sensision/mode/scriptstatistics.pm index 3b2e8059c..736f73a0e 100644 --- a/database/warp10/sensision/mode/scriptstatistics.pm +++ b/database/warp10/sensision/mode/scriptstatistics.pm @@ -41,8 +41,7 @@ sub set_counters { key_values => [ { name => 'time', diff => 1 } ], output_template => 'Time Spent: %d us', perfdatas => [ - { value => 'time_absolute', template => '%d', - min => 0, unit => 'us' }, + { template => '%d', min => 0, unit => 'us' }, ], } }, @@ -50,18 +49,15 @@ sub set_counters { key_values => [ { name => 'requests', diff => 1 } ], output_template => 'Requests: %d', perfdatas => [ - { value => 'requests_absolute', template => '%d', - min => 0 }, + { template => '%d', min => 0 }, ], } }, { label => 'requests-persecond', nlabel => 'requests.persecond', set => { - key_values => [ { name => 'requests', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'requests', per_second => 1 } ], output_template => 'Requests (per second): %.2f', perfdatas => [ - { value => 'requests_per_second', template => '%.2f', - min => 0 }, + { template => '%.2f', min => 0 }, ], } }, @@ -69,18 +65,15 @@ sub set_counters { key_values => [ { name => 'ops', diff => 1 } ], output_template => 'Ops: %d', perfdatas => [ - { value => 'ops_absolute', template => '%d', - min => 0 }, + { template => '%d', min => 0 }, ], } }, { label => 'ops-persecond', nlabel => 'ops.persecond', set => { - key_values => [ { name => 'ops', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'ops', per_second => 1 } ], output_template => 'Ops (per second): %.2f', perfdatas => [ - { value => 'ops_per_second', template => '%.2f', - min => 0 }, + { template => '%.2f', min => 0 }, ], } }, @@ -88,18 +81,15 @@ sub set_counters { key_values => [ { name => 'errors', diff => 1 } ], output_template => 'Errors: %d', perfdatas => [ - { value => 'errors_absolute', template => '%d', - min => 0 }, + { template => '%d', min => 0 }, ], } }, { label => 'errors-persecond', nlabel => 'errors.persecond', set => { - key_values => [ { name => 'errors', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'errors', per_second => 1 } ], output_template => 'Errors (per second): %.2f', perfdatas => [ - { value => 'errors_per_second', template => '%.2f', - min => 0 }, + { template => '%.2f', min => 0 }, ], } }, @@ -107,29 +97,26 @@ sub set_counters { key_values => [ { name => 'bootstrap_loads', diff => 1 } ], output_template => 'Bootstrap Loads: %d', perfdatas => [ - { value => 'bootstrap_loads_absolute', template => '%d', - min => 0 }, + { template => '%d', min => 0 }, ], } }, { label => 'bootstrap-loads-persecond', nlabel => 'bootstrap.loads.persecond', set => { - key_values => [ { name => 'bootstrap_loads', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'bootstrap_loads', per_second => 1 } ], output_template => 'Bootstrap Loads (per second): %.2f', perfdatas => [ - { value => 'bootstrap_loads_per_second', template => '%.2f', - min => 0 }, + { template => '%.2f', min => 0 }, ], } }, ]; + $self->{maps_counters}->{functions} = [ { label => 'time', nlabel => 'function.time.microseconds', set => { key_values => [ { name => 'time', diff => 1 }, { name => 'display' } ], output_template => 'Time Spent: %d us', perfdatas => [ - { value => 'time_absolute', template => '%d', - min => 0, unit => 'us', label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%d', min => 0, unit => 'us', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -137,21 +124,18 @@ sub set_counters { key_values => [ { name => 'count', diff => 1 }, { name => 'display' } ], output_template => 'Uses: %d', perfdatas => [ - { value => 'count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'uses-persecond', nlabel => 'function.uses.persecond', set => { - key_values => [ { name => 'count', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'count', per_second => 1 }, { name => 'display' } ], output_template => 'Uses (per second): %.2f', perfdatas => [ - { value => 'count_per_second', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%.2f', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } - }, + } ]; } @@ -167,7 +151,7 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, + 'filter-name:s' => { name => 'filter_name' } }); return $self; diff --git a/docs/en/developer/guide.rst b/docs/en/developer/guide.rst index 9eec3f5e8..aa886a646 100644 --- a/docs/en/developer/guide.rst +++ b/docs/en/developer/guide.rst @@ -108,11 +108,11 @@ Several modes can be declared in the **new** constructor: .. code-block:: perl - %{$self->{modes}} = ( - 'mode1' => '::mode::mode1', - 'mode2' => '::mode::mode2', - ... - ); + $self->{modes} = { + 'mode1' => '::mode::mode1', + 'mode2' => '::mode::mode2', + ... + }; Then, declare the module: @@ -194,12 +194,11 @@ Several options can be declared in the **new** constructor: .. code-block:: perl - $options{options}->add_options(arguments => - { - "option1:s" => { name => 'option1' }, - "option2:s" => { name => 'option2', default => 'value1' }, - "option3" => { name => 'option3' }, - }); + $options{options}->add_options(arguments => { + "option1:s" => { name => 'option1' }, + "option2:s" => { name => 'option2', default => 'value1' }, + "option3" => { name => 'option3' }, + }); Here is the description of arguments used in this example: @@ -1939,8 +1938,7 @@ We want to develop the following SNMP plugin: key_values => [ { name => 'sessions' } ], output_template => 'Current sessions : %s', perfdatas => [ - { label => 'sessions', value => 'sessions_absolute', template => '%s', - min => 0 }, + { label => 'sessions', template => '%s', min => 0 }, ], } }, @@ -1948,8 +1946,7 @@ We want to develop the following SNMP plugin: key_values => [ { name => 'sessions_ssl' } ], output_template => 'Current ssl sessions : %s', perfdatas => [ - { label => 'sessions_ssl', value => 'sessions_ssl_absolute', template => '%s', - min => 0 }, + { label => 'sessions_ssl', template => '%s', min => 0 }, ], } }, @@ -1962,11 +1959,14 @@ We want to develop the following SNMP plugin: # OIDs are fake. Only for the example. my ($oid_sessions, $oid_sessions_ssl) = ('.1.2.3.4.0', '.1.2.3.5.0'); - my $result = $options{snmp}->get_leef(oids => [ $oid_sessions, $oid_sessions_ssl ], - nothing_quit => 1); - $self->{global} = { sessions => $result->{$oid_sessions}, - sessions_ssl => $result->{$oid_sessions_ssl} - }; + my $result = $options{snmp}->get_leef( + oids => [ $oid_sessions, $oid_sessions_ssl ], + nothing_quit => 1 + ); + $self->{global} = { + sessions => $result->{$oid_sessions}, + sessions_ssl => $result->{$oid_sessions_ssl} + }; } @@ -1996,15 +1996,15 @@ As you can see, we create two arrays of hash tables in **set_counters** method. * *name*: attribute name. Need to match with attributes in **manage_selection** method! * *diff*: if we set the value to 1, we'll have the difference between two checks (need a statefile!). + * *per_second*: if we set the value to 1, the *diff* values will be calculated per seconds (need a statefile!). No need to add diff attribute. * *output_template*: string to display. '%s' will be replaced by the first value of *keys_values*. * *output_use*: which value to be used in *output_template* (If not set, we use the first value of *keys_values*). - * *per_second*: if we set the value to 1, the *diff* values will be calculated per seconds. * *output_change_bytes*: if we set the value to 1 or 2, we can use a second '%s' in *output_template* to display the unit. 1 = divide by 1024 (Bytes), 2 = divide by 1000 (bits). * *perfdata*: array of hashes. To configure perfdatas * *label*: name displayed. - * *value*: value to used. It's the name from *keys_values* with a **suffix**: '_absolute' or '_per_second' (depends of other options). + * *value*: value to used. It's the name from *keys_values*. * *template*: value format (could be for example: '%.3f'). * *unit*: unit displayed. * *min*, *max*: min and max displayed. You can use a value from *keys_values*. @@ -2037,8 +2037,7 @@ We want to add the current number of sessions by virtual servers. key_values => [ { name => 'sessions' } ], output_template => 'current sessions : %s', perfdatas => [ - { label => 'total_sessions', value => 'sessions_absolute', template => '%s', - min => 0 }, + { label => 'total_sessions', template => '%s', min => 0 }, ], } }, @@ -2046,8 +2045,7 @@ We want to add the current number of sessions by virtual servers. key_values => [ { name => 'sessions_ssl' } ], output_template => 'current ssl sessions : %s', perfdatas => [ - { label => 'total_sessions_ssl', value => 'sessions_ssl_absolute', template => '%s', - min => 0 }, + { label => 'total_sessions_ssl', template => '%s', min => 0 }, ], } }, @@ -2058,8 +2056,8 @@ We want to add the current number of sessions by virtual servers. key_values => [ { name => 'sessions' }, { name => 'display' } ], output_template => 'current sessions : %s', perfdatas => [ - { label => 'sessions', value => 'sessions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'sessions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -2067,8 +2065,8 @@ We want to add the current number of sessions by virtual servers. key_values => [ { name => 'sessions_ssl' }, { name => 'display' } ], output_template => 'current ssl sessions : %s', perfdatas => [ - { label => 'sessions_ssl', value => 'sessions_ssl_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'sessions_ssl', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -2151,9 +2149,9 @@ The model can also be used to check strings (not only counters). So we want to c closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => $self->can('custom_threshold_output'), + closure_custom_threshold_check => $self->can('custom_threshold_output') } - }, + } ]; } @@ -2219,7 +2217,7 @@ The model can also be used to check strings (not only counters). So we want to c The following example show 4 new attributes: -* *closure_custom_calc*: should be used to have a simple name (without '_absolute' or '_per_second'). Or to do some more complex calculation. +* *closure_custom_calc*: should be used to do more complex calculation. * *closure_custom_output*: should be used to have a more complex output (An example: want to display the total, free and used value at the same time). * *closure_custom_perfdata*: should be used to manage yourself the perfdata. * *closure_custom_threshold_check*: should be used to manage yourself the threshold check. diff --git a/hardware/ats/apc/snmp/mode/inputlines.pm b/hardware/ats/apc/snmp/mode/inputlines.pm index e56ec7c4f..de361a56a 100644 --- a/hardware/ats/apc/snmp/mode/inputlines.pm +++ b/hardware/ats/apc/snmp/mode/inputlines.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'atsInputVoltage' }, { name => 'display' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { label => 'voltage', value => 'atsInputVoltage_absolute', template => '%s', - unit => 'V', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'voltage', value => 'atsInputVoltage', template => '%s', + unit => 'V', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'atsInputCurrent' }, { name => 'display' } ], output_template => 'Current : %.2f A', perfdatas => [ - { label => 'current', value => 'atsInputCurrent_absolute', template => '%s', - unit => 'A', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current', value => 'atsInputCurrent', template => '%s', + unit => 'A', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'atsInputPower' }, { name => 'display' } ], output_template => 'Power : %.2f W', perfdatas => [ - { label => 'power', value => 'atsInputPower_absolute', template => '%s', - unit => 'W', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'power', value => 'atsInputPower', template => '%s', + unit => 'W', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/ats/apc/snmp/mode/outputlines.pm b/hardware/ats/apc/snmp/mode/outputlines.pm index f14c23c7f..faa9809a2 100644 --- a/hardware/ats/apc/snmp/mode/outputlines.pm +++ b/hardware/ats/apc/snmp/mode/outputlines.pm @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'atsOutputVoltage' }, { name => 'display' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { label => 'voltage', value => 'atsOutputVoltage_absolute', template => '%s', - unit => 'V', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'voltage', value => 'atsOutputVoltage', template => '%s', + unit => 'V', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'atsOutputCurrent' }, { name => 'display' } ], output_template => 'Current : %.2f A', perfdatas => [ - { label => 'current', value => 'atsOutputCurrent_absolute', template => '%s', - unit => 'A', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current', value => 'atsOutputCurrent', template => '%s', + unit => 'A', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -64,8 +64,8 @@ sub set_counters { key_values => [ { name => 'atsOutputPower' }, { name => 'display' } ], output_template => 'Power : %.2f W', perfdatas => [ - { label => 'power', value => 'atsOutputPower_absolute', template => '%s', - unit => 'W', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'power', value => 'atsOutputPower', template => '%s', + unit => 'W', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -73,8 +73,8 @@ sub set_counters { key_values => [ { name => 'atsOutputLoad' }, { name => 'display' } ], output_template => 'Load : %.2f VA', perfdatas => [ - { label => 'load', value => 'atsOutputLoad_absolute', template => '%s', - unit => 'VA', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load', value => 'atsOutputLoad', template => '%s', + unit => 'VA', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'atsOutputPercentLoad' }, { name => 'display' } ], output_template => 'Load capacity : %.2f %%', perfdatas => [ - { label => 'load_capacity', value => 'atsOutputPercentLoad_absolute', template => '%s', - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute', min => 0, max => 100 }, + { label => 'load_capacity', value => 'atsOutputPercentLoad', template => '%s', + unit => '%', label_extra_instance => 1, instance_use => 'display', min => 0, max => 100 }, ], } }, diff --git a/hardware/ats/eaton/snmp/mode/inputlines.pm b/hardware/ats/eaton/snmp/mode/inputlines.pm index 64f6fd22a..af50035f0 100644 --- a/hardware/ats/eaton/snmp/mode/inputlines.pm +++ b/hardware/ats/eaton/snmp/mode/inputlines.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'voltage' }, { name => 'display' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'voltage_absolute', template => '%s', - unit => 'V', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'voltage', template => '%s', + unit => 'V', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'frequency', no_value => -1 } ], output_template => 'Frequence : %.2f Hz', perfdatas => [ - { value => 'frequency_absolute', template => '%.2f', + { value => 'frequency', template => '%.2f', unit => 'Hz', label_extra_instance => 1 }, ], } diff --git a/hardware/ats/eaton/snmp/mode/outputline.pm b/hardware/ats/eaton/snmp/mode/outputline.pm index 6ad484216..2d3449afa 100644 --- a/hardware/ats/eaton/snmp/mode/outputline.pm +++ b/hardware/ats/eaton/snmp/mode/outputline.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'voltage_absolute', template => '%s', + { value => 'voltage', template => '%s', unit => 'V' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'current : %s A', perfdatas => [ - { template => '%s', value => 'current_absolute', + { template => '%s', value => 'current', unit => 'A', min => 0 }, ], } diff --git a/hardware/ats/eaton/snmp/mode/system.pm b/hardware/ats/eaton/snmp/mode/system.pm index 6e0d36422..246aa1b63 100644 --- a/hardware/ats/eaton/snmp/mode/system.pm +++ b/hardware/ats/eaton/snmp/mode/system.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'temperature' } ], output_template => 'temperature : %s C', perfdatas => [ - { label => 'temperature', value => 'temperature_absolute', template => '%s', + { label => 'temperature', value => 'temperature', template => '%s', unit => 'C' }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'humidity' } ], output_template => 'humidity : %s %%', perfdatas => [ - { label => 'humidity', value => 'humidity_absolute', template => '%s', + { label => 'humidity', value => 'humidity', template => '%s', unit => '%', min => 9, max => 100 }, ], } diff --git a/hardware/devices/abb/cms700/snmp/mode/mainsmeasurements.pm b/hardware/devices/abb/cms700/snmp/mode/mainsmeasurements.pm index ca5ed8aea..f41f00074 100644 --- a/hardware/devices/abb/cms700/snmp/mode/mainsmeasurements.pm +++ b/hardware/devices/abb/cms700/snmp/mode/mainsmeasurements.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'p3' } ], output_template => 'Active Power: %.2f W', perfdatas => [ - { value => 'p3_absolute', template => '%.2f', unit => 'W', min => 0 }, + { value => 'p3', template => '%.2f', unit => 'W', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'q3' } ], output_template => 'Reactive Power: %.2f VAR', perfdatas => [ - { value => 'q3_absolute', template => '%.2f', unit => 'VAR', min => 0 }, + { value => 'q3', template => '%.2f', unit => 'VAR', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 's3' } ], output_template => 'Apparent Power: %.2f VA', perfdatas => [ - { value => 's3_absolute', template => '%.2f', unit => 'VA', min => 0 }, + { value => 's3', template => '%.2f', unit => 'VA', min => 0 }, ], } }, @@ -72,8 +72,8 @@ sub set_counters { key_values => [ { name => 'uL' }, { name => 'display' } ], output_template => 'Voltage: %.2f V', perfdatas => [ - { value => 'uL_absolute', template => '%.2f', unit => 'V', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'uL', template => '%.2f', unit => 'V', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -81,8 +81,8 @@ sub set_counters { key_values => [ { name => 'iL' }, { name => 'display' } ], output_template => 'Current: %.2f A', perfdatas => [ - { value => 'iL_absolute', template => '%.2f', unit => 'A', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'iL', template => '%.2f', unit => 'A', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -90,8 +90,8 @@ sub set_counters { key_values => [ { name => 'pfL' }, { name => 'display' } ], output_template => 'Power Factor: %.2f', perfdatas => [ - { value => 'pfL_absolute', template => '%.2f', min => 0, max => 1, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'pfL', template => '%.2f', min => 0, max => 1, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -99,8 +99,8 @@ sub set_counters { key_values => [ { name => 'cosP' }, { name => 'display' } ], output_template => 'Cos Phi: %.2f', perfdatas => [ - { value => 'cosP_absolute', template => '%.2f', min => 0, max => 1, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'cosP', template => '%.2f', min => 0, max => 1, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -108,8 +108,8 @@ sub set_counters { key_values => [ { name => 'pL' }, { name => 'display' } ], output_template => 'Active Power: %.2f W', perfdatas => [ - { value => 'pL_absolute', template => '%.2f', unit => 'W', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'pL', template => '%.2f', unit => 'W', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -117,8 +117,8 @@ sub set_counters { key_values => [ { name => 'qL' }, { name => 'display' } ], output_template => 'Reactive Power: %.2f VAR', perfdatas => [ - { value => 'qL_absolute', template => '%.2f', unit => 'VAR', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'qL', template => '%.2f', unit => 'VAR', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -126,8 +126,8 @@ sub set_counters { key_values => [ { name => 'sL' }, { name => 'display' } ], output_template => 'Apparent Power: %.2f VA', perfdatas => [ - { value => 'sL_absolute', template => '%.2f', unit => 'VA', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'sL', template => '%.2f', unit => 'VA', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -135,8 +135,8 @@ sub set_counters { key_values => [ { name => 'whL' }, { name => 'display' } ], output_template => 'Active Energy: %.2f Wh', perfdatas => [ - { value => 'whL_absolute', template => '%.2f', unit => 'Wh', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'whL', template => '%.2f', unit => 'Wh', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -144,8 +144,8 @@ sub set_counters { key_values => [ { name => 'qhL' }, { name => 'display' } ], output_template => 'Reactive Energy: %.2f VARh', perfdatas => [ - { value => 'qhL_absolute', template => '%.2f', unit => 'VARh', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'qhL', template => '%.2f', unit => 'VARh', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -153,8 +153,8 @@ sub set_counters { key_values => [ { name => 'shL' }, { name => 'display' } ], output_template => 'Apparent Energy: %.2f VAh', perfdatas => [ - { value => 'shL_absolute', template => '%.2f', unit => 'VAh', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'shL', template => '%.2f', unit => 'VAh', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -162,8 +162,8 @@ sub set_counters { key_values => [ { name => 'thdUL' }, { name => 'display' } ], output_template => 'Voltage THD: %.2f %%', perfdatas => [ - { value => 'thdUL_absolute', template => '%.2f', unit => '%', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'thdUL', template => '%.2f', unit => '%', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -171,8 +171,8 @@ sub set_counters { key_values => [ { name => 'thdIL' }, { name => 'display' } ], output_template => 'Current THD: %.2f %%', perfdatas => [ - { value => 'thdIL_absolute', template => '%.2f', unit => '%', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'thdIL', template => '%.2f', unit => '%', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/devices/abb/cms700/snmp/mode/sensorsmeasurements.pm b/hardware/devices/abb/cms700/snmp/mode/sensorsmeasurements.pm index 820de2f5c..798f988f6 100644 --- a/hardware/devices/abb/cms700/snmp/mode/sensorsmeasurements.pm +++ b/hardware/devices/abb/cms700/snmp/mode/sensorsmeasurements.pm @@ -50,8 +50,8 @@ sub set_counters { key_values => [ { name => 'TRMSsens' }, { name => 'display' } ], output_template => 'Mixte Current: %.2f A', perfdatas => [ - { value => 'TRMSsens_absolute', template => '%.2f', unit => 'A', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'TRMSsens', template => '%.2f', unit => 'A', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -59,8 +59,8 @@ sub set_counters { key_values => [ { name => 'ACsens' }, { name => 'display' } ], output_template => 'Alternative Current: %.2f A', perfdatas => [ - { value => 'ACsens_absolute', template => '%.2f', unit => 'A', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'ACsens', template => '%.2f', unit => 'A', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -68,8 +68,8 @@ sub set_counters { key_values => [ { name => 'DCsens' }, { name => 'display' } ], output_template => 'Direct Current: %.2f A', perfdatas => [ - { value => 'DCsens_absolute', template => '%.2f', unit => 'A', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'DCsens', template => '%.2f', unit => 'A', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -77,8 +77,8 @@ sub set_counters { key_values => [ { name => 'Psens' }, { name => 'display' } ], output_template => 'Active Power: %.2f W', perfdatas => [ - { value => 'Psens_absolute', template => '%.2f', unit => 'W', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'Psens', template => '%.2f', unit => 'W', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -86,8 +86,8 @@ sub set_counters { key_values => [ { name => 'Whsens' }, { name => 'display' } ], output_template => 'Active Energy: %.2f Wh', perfdatas => [ - { value => 'Whsens_absolute', template => '%.2f', unit => 'Wh', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'Whsens', template => '%.2f', unit => 'Wh', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -95,8 +95,8 @@ sub set_counters { key_values => [ { name => 'PowerFactorsens' }, { name => 'display' } ], output_template => 'Power Factor: %.2f', perfdatas => [ - { value => 'PowerFactorsens_absolute', template => '%.2f', min => 0, max => 1, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'PowerFactorsens', template => '%.2f', min => 0, max => 1, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/devices/aeg/acm/snmp/mode/batterystatus.pm b/hardware/devices/aeg/acm/snmp/mode/batterystatus.pm index 848f602a3..e49048277 100644 --- a/hardware/devices/aeg/acm/snmp/mode/batterystatus.pm +++ b/hardware/devices/aeg/acm/snmp/mode/batterystatus.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'battVoltage' } ], output_template => 'Voltage : %s V', perfdatas => [ - { label => 'voltage', value => 'battVoltage_absolute', template => '%s', + { label => 'voltage', value => 'battVoltage', template => '%s', unit => 'V' }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'battCurrent' } ], output_template => 'Current : %s A', perfdatas => [ - { label => 'current', value => 'battCurrent_absolute', template => '%s', + { label => 'current', value => 'battCurrent', template => '%s', min => 0, unit => 'A' }, ], } @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'battCurrent1' } ], output_template => 'Current 1 : %s A', perfdatas => [ - { label => 'current1', value => 'battCurrent1_absolute', template => '%s', + { label => 'current1', value => 'battCurrent1', template => '%s', min => 0, unit => 'A' }, ], } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'battCurrent2' } ], output_template => 'Current 2 : %s A', perfdatas => [ - { label => 'current2', value => 'battCurrent2_absolute', template => '%s', + { label => 'current2', value => 'battCurrent2', template => '%s', min => 0, unit => 'A' }, ], } @@ -96,7 +96,7 @@ sub set_counters { key_values => [ { name => 'battTemp' } ], output_template => 'Temperature : %s C', perfdatas => [ - { label => 'temperature', value => 'battTemp_absolute', template => '%s', + { label => 'temperature', value => 'battTemp', template => '%s', unit => 'C'}, ], } @@ -105,7 +105,7 @@ sub set_counters { key_values => [ { name => 'battTemp1' } ], output_template => 'Temperature 1 : %s C', perfdatas => [ - { label => 'temperature1', value => 'battTemp1_absolute', template => '%s', + { label => 'temperature1', value => 'battTemp1', template => '%s', unit => 'C'}, ], } @@ -114,7 +114,7 @@ sub set_counters { key_values => [ { name => 'battTemp2' } ], output_template => 'Temperature 2 : %s C', perfdatas => [ - { label => 'temperature2', value => 'battTemp2_absolute', template => '%s', + { label => 'temperature2', value => 'battTemp2', template => '%s', unit => 'C'}, ], } @@ -123,7 +123,7 @@ sub set_counters { key_values => [ { name => 'battAmpHMeter' } ], output_template => 'Amp Hour Meter : %s %%', perfdatas => [ - { label => 'amphourmeter', value => 'battAmpHMeter_absolute', template => '%s', + { label => 'amphourmeter', value => 'battAmpHMeter', template => '%s', unit => '%'}, ], } diff --git a/hardware/devices/aeg/acm/snmp/mode/loadstatus.pm b/hardware/devices/aeg/acm/snmp/mode/loadstatus.pm index 495e6fd06..e8257e78e 100644 --- a/hardware/devices/aeg/acm/snmp/mode/loadstatus.pm +++ b/hardware/devices/aeg/acm/snmp/mode/loadstatus.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'loadVoltage' } ], output_template => 'Voltage : %s V', perfdatas => [ - { label => 'voltage', value => 'loadVoltage_absolute', template => '%s', + { label => 'voltage', value => 'loadVoltage', template => '%s', unit => 'V' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'loadCurrent' } ], output_template => 'Current : %s A', perfdatas => [ - { label => 'current', value => 'loadCurrent_absolute', template => '%s', + { label => 'current', value => 'loadCurrent', template => '%s', min => 0, unit => 'A' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'loadPower' } ], output_template => 'Power : %s W', perfdatas => [ - { label => 'power', value => 'loadPower_absolute', template => '%s', + { label => 'power', value => 'loadPower', template => '%s', unit => 'w'}, ], } diff --git a/hardware/devices/aeg/acm/snmp/mode/rectifierstatus.pm b/hardware/devices/aeg/acm/snmp/mode/rectifierstatus.pm index 5c16939c7..e13c5542b 100644 --- a/hardware/devices/aeg/acm/snmp/mode/rectifierstatus.pm +++ b/hardware/devices/aeg/acm/snmp/mode/rectifierstatus.pm @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'rectVoltage' } ], output_template => 'Voltage : %s V', perfdatas => [ - { label => 'voltage', value => 'rectVoltage_absolute', template => '%s', + { label => 'voltage', value => 'rectVoltage', template => '%s', unit => 'V' }, ], } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'rectCurrent' } ], output_template => 'Current : %s A', perfdatas => [ - { label => 'current', value => 'rectCurrent_absolute', template => '%s', + { label => 'current', value => 'rectCurrent', template => '%s', min => 0, unit => 'A' }, ], } @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'nbrOfFaultyRect' } ], output_template => 'Faulty rectifiers : %s', perfdatas => [ - { label => 'faulty_count', value => 'nbrOfFaultyRect_absolute', template => '%s', + { label => 'faulty_count', value => 'nbrOfFaultyRect', template => '%s', min => 0, unit => '' }, ], } diff --git a/hardware/devices/camera/hikvision/snmp/mode/cpu.pm b/hardware/devices/camera/hikvision/snmp/mode/cpu.pm index 6733b0a61..b6cb49bf8 100644 --- a/hardware/devices/camera/hikvision/snmp/mode/cpu.pm +++ b/hardware/devices/camera/hikvision/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'used' } ], output_template => 'CPU Usage: %.2f %%', perfdatas => [ - { value => 'used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/hardware/devices/camera/hikvision/snmp/mode/disk.pm b/hardware/devices/camera/hikvision/snmp/mode/disk.pm index bd453e7e5..7675658e1 100644 --- a/hardware/devices/camera/hikvision/snmp/mode/disk.pm +++ b/hardware/devices/camera/hikvision/snmp/mode/disk.pm @@ -30,11 +30,11 @@ sub custom_disk_output { my ($self, %options) = @_; my $msg = sprintf("Disk Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); return $msg; } @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_disk_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_disk_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Disk Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/hardware/devices/camera/hikvision/snmp/mode/memory.pm b/hardware/devices/camera/hikvision/snmp/mode/memory.pm index d059f5129..b3aa23a18 100644 --- a/hardware/devices/camera/hikvision/snmp/mode/memory.pm +++ b/hardware/devices/camera/hikvision/snmp/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_mem_output { my ($self, %options) = @_; my $msg = sprintf("Memory Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); return $msg; } @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_mem_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_mem_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Memory Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/hardware/devices/camera/mobotix/snmp/mode/system.pm b/hardware/devices/camera/mobotix/snmp/mode/system.pm index 36078b217..93c17c962 100644 --- a/hardware/devices/camera/mobotix/snmp/mode/system.pm +++ b/hardware/devices/camera/mobotix/snmp/mode/system.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'storageArchiveBufferFillLevel', no_value => -1 } ], output_template => 'sd card usage: %.2f %%', perfdatas => [ - { value => 'storageArchiveBufferFillLevel_absolute', template => '%d', min => 0, max => 100, + { value => 'storageArchiveBufferFillLevel', template => '%d', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'statusTemperatureCameraC', no_value => -1000 } ], output_template => 'internal temperature: %s C', perfdatas => [ - { value => 'statusTemperatureCameraC_absolute', template => '%s', unit => 'C' }, + { value => 'statusTemperatureCameraC', template => '%s', unit => 'C' }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'statusTemperatureOutsideC', no_value => -1000 } ], output_template => 'external temperature: %s C', perfdatas => [ - { value => 'statusTemperatureOutsideC_absolute', template => '%s', unit => 'C' }, + { value => 'statusTemperatureOutsideC', template => '%s', unit => 'C' }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'statusTemperatureGpsC', no_value => -1000 } ], output_template => 'gps temperature: %s C', perfdatas => [ - { value => 'statusTemperatureGpsC_absolute', template => '%s', unit => 'C' }, + { value => 'statusTemperatureGpsC', template => '%s', unit => 'C' }, ], } }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'statusSensorIlluminationR', no_value => -1000 } ], output_template => 'illumination right: %s lx', perfdatas => [ - { value => 'statusSensorIlluminationR_absolute', template => '%s', unit => 'lx' }, + { value => 'statusSensorIlluminationR', template => '%s', unit => 'lx' }, ], } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'statusSensorIlluminationL', no_value => -1000 } ], output_template => 'illumination left: %s lx', perfdatas => [ - { value => 'statusSensorIlluminationL_absolute', template => '%s', unit => 'lx' }, + { value => 'statusSensorIlluminationL', template => '%s', unit => 'lx' }, ], } }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'videoMainCurrentFrameRate', no_value => -1000 } ], output_template => 'video framerate: %s fps', perfdatas => [ - { value => 'videoMainCurrentFrameRate_absolute', template => '%s', unit => 'fps' }, + { value => 'videoMainCurrentFrameRate', template => '%s', unit => 'fps' }, ], } } diff --git a/hardware/devices/cisco/ces/restapi/mode/callsrt.pm b/hardware/devices/cisco/ces/restapi/mode/callsrt.pm index 7ceb4648f..9a477dd3f 100644 --- a/hardware/devices/cisco/ces/restapi/mode/callsrt.pm +++ b/hardware/devices/cisco/ces/restapi/mode/callsrt.pm @@ -118,7 +118,7 @@ sub set_counters { $self->{maps_counters}->{channels} = [ { label => 'channels-traffic', nlabel => 'call.channels.traffic.bytes', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), output_template => 'traffic: %s %s/s', output_change_bytes => 1, diff --git a/hardware/devices/cisco/ces/restapi/mode/callssummary.pm b/hardware/devices/cisco/ces/restapi/mode/callssummary.pm index d62400227..d987852c9 100644 --- a/hardware/devices/cisco/ces/restapi/mode/callssummary.pm +++ b/hardware/devices/cisco/ces/restapi/mode/callssummary.pm @@ -32,9 +32,9 @@ sub custom_loss_output { return sprintf( "packets loss: %.2f%% (%s on %s)", - $self->{result_values}->{loss_prct_absolute}, - $self->{result_values}->{loss_absolute}, - $self->{result_values}->{pkts_absolute} + $self->{result_values}->{loss_prct}, + $self->{result_values}->{loss}, + $self->{result_values}->{pkts} ); } @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'new_calls' } ], output_template => 'total calls finished: %d', perfdatas => [ - { value => 'new_calls_absolute', template => '%d', min => 0 }, + { value => 'new_calls', template => '%d', min => 0 }, ], } } @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => 'loss' }, { name => 'pkts' }, { name => 'loss_prct' } ], closure_custom_output => $self->can('custom_loss_output'), perfdatas => [ - { value => 'loss_absolute', template => '%d', min => 0 }, + { value => 'loss', template => '%d', min => 0 }, ], } }, @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'loss_prct' }, { name => 'loss' }, { name => 'pkts' } ], closure_custom_output => $self->can('custom_loss_output'), perfdatas => [ - { value => 'loss_prct_absolute', template => '%d', unit => '%', min => 0, max => 100 }, + { value => 'loss_prct', template => '%d', unit => '%', min => 0, max => 100 }, ], } }, @@ -89,7 +89,7 @@ sub set_counters { key_values => [ { name => 'maxjitter' } ], output_template => 'max jitter: %s ms', perfdatas => [ - { value => 'maxjitter_absolute', template => '%d', unit => 'ms', min => 0 }, + { value => 'maxjitter', template => '%d', unit => 'ms', min => 0 }, ], } }, diff --git a/hardware/devices/cisco/ces/restapi/mode/certificates.pm b/hardware/devices/cisco/ces/restapi/mode/certificates.pm index be25a55bd..cb73eb87d 100644 --- a/hardware/devices/cisco/ces/restapi/mode/certificates.pm +++ b/hardware/devices/cisco/ces/restapi/mode/certificates.pm @@ -31,7 +31,7 @@ sub custom_validity_output { return sprintf( 'expires in %s', - $self->{result_values}->{generation_time_absolute} + $self->{result_values}->{generation_time} ); } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'validity_time' }, { name => 'generation_time' } ], closure_custom_output => $self->can('custom_validity_output'), perfdatas => [ - { value => 'validity_time_absolute', template => '%d', min => 0, unit => 's' }, + { value => 'validity_time', template => '%d', min => 0, unit => 's' }, ], } } diff --git a/hardware/devices/cisco/ces/restapi/mode/peripherals.pm b/hardware/devices/cisco/ces/restapi/mode/peripherals.pm index e468d76c6..5c3e0dc5a 100644 --- a/hardware/devices/cisco/ces/restapi/mode/peripherals.pm +++ b/hardware/devices/cisco/ces/restapi/mode/peripherals.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'connected' } ], output_template => 'peripherals connected: %d', perfdatas => [ - { value => 'connected_absolute', template => '%d', min => 0 }, + { value => 'connected', template => '%d', min => 0 }, ], } } diff --git a/hardware/devices/cisco/ces/restapi/mode/sessions.pm b/hardware/devices/cisco/ces/restapi/mode/sessions.pm index 786e1334c..56351b865 100644 --- a/hardware/devices/cisco/ces/restapi/mode/sessions.pm +++ b/hardware/devices/cisco/ces/restapi/mode/sessions.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'sessions' } ], output_template => 'total current sessions: %d', perfdatas => [ - { value => 'sessions_absolute', template => '%d', min => 0 }, + { value => 'sessions', template => '%d', min => 0 }, ], } } diff --git a/hardware/devices/eltek/enexus/snmp/mode/alarms.pm b/hardware/devices/eltek/enexus/snmp/mode/alarms.pm index dcb1c84a2..0e3a868ba 100644 --- a/hardware/devices/eltek/enexus/snmp/mode/alarms.pm +++ b/hardware/devices/eltek/enexus/snmp/mode/alarms.pm @@ -48,7 +48,7 @@ sub set_counters { key_values => [ { name => 'active' }, { name => 'total' } ], output_template => 'current active alarms: %d', perfdatas => [ - { value => 'active_absolute', template => '%d', min => 0, max => 'total_absolute' } + { value => 'active', template => '%d', min => 0, max => 'total' } ] } } diff --git a/hardware/devices/eltek/enexus/snmp/mode/battery.pm b/hardware/devices/eltek/enexus/snmp/mode/battery.pm index c0582dea4..d73e366d2 100644 --- a/hardware/devices/eltek/enexus/snmp/mode/battery.pm +++ b/hardware/devices/eltek/enexus/snmp/mode/battery.pm @@ -39,8 +39,8 @@ sub custom_temperature_output { my ($self, %options) = @_; return sprintf('temperature: %s %s', - $self->{result_values}->{temperature_absolute}, - $self->{result_values}->{temperature_unit_absolute} + $self->{result_values}->{temperature}, + $self->{result_values}->{temperature_unit} ); } @@ -48,9 +48,9 @@ sub custom_temperature_perfdata { my ($self, %options) = @_; $self->{output}->perfdata_add( - nlabel => 'battery.temperature.' . ($self->{result_values}->{temperature_unit_absolute} eq 'C' ? 'celsius' : 'fahrenheit'), - unit => $self->{result_values}->{temperature_unit_absolute}, - value => $self->{result_values}->{temperature_absolute}, + nlabel => 'battery.temperature.' . ($self->{result_values}->{temperature_unit} eq 'C' ? 'celsius' : 'fahrenheit'), + unit => $self->{result_values}->{temperature_unit}, + value => $self->{result_values}->{temperature}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), ); @@ -60,8 +60,8 @@ sub custom_charge_remaining_output { my ($self, %options) = @_; return sprintf('remaining capacity: %s %s', - $self->{result_values}->{charge_remaining_absolute}, - $self->{result_values}->{charge_remaining_unit_absolute} + $self->{result_values}->{charge_remaining}, + $self->{result_values}->{charge_remaining_unit} ); } @@ -69,13 +69,13 @@ sub custom_charge_remaining_perfdata { my ($self, %options) = @_; $self->{output}->perfdata_add( - nlabel => 'battery.charge.remaining.' . ($self->{result_values}->{charge_remaining_unit_absolute} eq '%' ? 'percentage' : 'amperehour'), - unit => $self->{result_values}->{charge_remaining_unit_absolute}, - value => $self->{result_values}->{charge_remaining_absolute}, + nlabel => 'battery.charge.remaining.' . ($self->{result_values}->{charge_remaining_unit} eq '%' ? 'percentage' : 'amperehour'), + unit => $self->{result_values}->{charge_remaining_unit}, + value => $self->{result_values}->{charge_remaining}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0, - max => $self->{result_values}->{charge_remaining_unit_absolute} eq '%' ? 100 : undef + max => $self->{result_values}->{charge_remaining_unit} eq '%' ? 100 : undef ); } @@ -84,7 +84,7 @@ sub custom_charge_time_output { return sprintf( 'remaining time: %s', - centreon::plugins::misc::change_seconds(value => $self->{result_values}->{charge_remaining_time_absolute}) + centreon::plugins::misc::change_seconds(value => $self->{result_values}->{charge_remaining_time}) ); } @@ -120,7 +120,7 @@ sub set_counters { key_values => [ { name => 'charge_remaining_time' } ], closure_custom_output => $self->can('custom_charge_time_output'), perfdatas => [ - { value => 'charge_remaining_time_absolute', template => '%s', min => 0, unit => 's' }, + { value => 'charge_remaining_time', template => '%s', min => 0, unit => 's' }, ], } }, @@ -128,7 +128,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'voltage: %.2f V', perfdatas => [ - { value => 'voltage_absolute', template => '%.2f', unit => 'V' } + { value => 'voltage', template => '%.2f', unit => 'V' } ] } }, @@ -136,7 +136,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'current: %.2f A', perfdatas => [ - { value => 'current_absolute', template => '%.2f', min => 0, unit => 'A' } + { value => 'current', template => '%.2f', min => 0, unit => 'A' } ] } } diff --git a/hardware/devices/eltek/enexus/snmp/mode/load.pm b/hardware/devices/eltek/enexus/snmp/mode/load.pm index 2c55a4048..6019b0702 100644 --- a/hardware/devices/eltek/enexus/snmp/mode/load.pm +++ b/hardware/devices/eltek/enexus/snmp/mode/load.pm @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'current: %s A', perfdatas => [ - { value => 'current_absolute', template => '%s', unit => 'A', min => 0 } + { value => 'current', template => '%s', unit => 'A', min => 0 } ] } }, @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'power' } ], output_template => 'power: %s W', perfdatas => [ - { value => 'power_absolute', template => '%s', unit => 'W', min => 0 } + { value => 'power', template => '%s', unit => 'W', min => 0 } ] } } @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'voltage: %.2f V', perfdatas => [ - { value => 'voltage_absolute', template => '%.2f', unit => 'V', label_extra_instance => 1 } + { value => 'voltage', template => '%.2f', unit => 'V', label_extra_instance => 1 } ] } } diff --git a/hardware/devices/eltek/enexus/snmp/mode/outputs.pm b/hardware/devices/eltek/enexus/snmp/mode/outputs.pm index 37a86ffcb..0d318707a 100644 --- a/hardware/devices/eltek/enexus/snmp/mode/outputs.pm +++ b/hardware/devices/eltek/enexus/snmp/mode/outputs.pm @@ -48,7 +48,7 @@ sub set_counters { key_values => [ { name => 'disconnected' }, { name => 'total_contactors' } ], output_template => 'current disconnected outputs: %d', perfdatas => [ - { value => 'disconnected_absolute', template => '%d', min => 0, max => 'total_contactors_absolute' } + { value => 'disconnected', template => '%d', min => 0, max => 'total_contactors' } ] } }, @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'notenergized' }, { name => 'total_relay' } ], output_template => 'current not energized outputs: %d', perfdatas => [ - { value => 'notenergized_absolute', template => '%d', min => 0, max => 'total_relay_absolute' } + { value => 'notenergized', template => '%d', min => 0, max => 'total_relay' } ] } } diff --git a/hardware/devices/gorgy/ntpserver/snmp/mode/globalstatus.pm b/hardware/devices/gorgy/ntpserver/snmp/mode/globalstatus.pm index 0f27aabaf..03713e7a4 100644 --- a/hardware/devices/gorgy/ntpserver/snmp/mode/globalstatus.pm +++ b/hardware/devices/gorgy/ntpserver/snmp/mode/globalstatus.pm @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'ntp_requests', diff => 1 } ], output_template => 'Number of ntp requests : %s', perfdatas => [ - { label => 'ntp_requests', value => 'ntp_requests_absolute', template => '%s', + { label => 'ntp_requests', value => 'ntp_requests', template => '%s', min => 0 }, ], } diff --git a/hardware/devices/masterclock/ntp100gps/snmp/mode/ntpperformance.pm b/hardware/devices/masterclock/ntp100gps/snmp/mode/ntpperformance.pm index b5ba72ad7..06e43d4eb 100644 --- a/hardware/devices/masterclock/ntp100gps/snmp/mode/ntpperformance.pm +++ b/hardware/devices/masterclock/ntp100gps/snmp/mode/ntpperformance.pm @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'stratum_level' } ], output_template => 'Stratum level : %d', perfdatas => [ - { label => 'stratum_level', value => 'stratum_level_absolute', template => '%d', + { label => 'stratum_level', value => 'stratum_level', template => '%d', min => 0, max => 16 }, ], } @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'precision' } ], output_template => 'Precision : %s seconds', perfdatas => [ - { label => 'precision', value => 'precision_absolute', template => '%s', + { label => 'precision', value => 'precision', template => '%s', min => 0, unit => "seconds" }, ], } @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'poll_interval' } ], output_template => 'Poll interval : %d seconds', perfdatas => [ - { label => 'poll_interval', value => 'poll_interval_absolute', template => '%d', + { label => 'poll_interval', value => 'poll_interval', template => '%d', min => 0, unit => "seconds" }, ], } diff --git a/hardware/devices/polycom/trio/restapi/mode/callsrt.pm b/hardware/devices/polycom/trio/restapi/mode/callsrt.pm index 57c411f56..356a548bd 100644 --- a/hardware/devices/polycom/trio/restapi/mode/callsrt.pm +++ b/hardware/devices/polycom/trio/restapi/mode/callsrt.pm @@ -29,7 +29,7 @@ use Digest::MD5 qw(md5_hex); sub custom_loss_calc { my ($self, %options) = @_; - $self->{result_values}->{display_absolute} = $options{new_datas}->{$self->{instance} . '_display'}; + $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'}; my $diff_pkts = ($options{new_datas}->{$self->{instance} . '_packets'} - $options{old_datas}->{$self->{instance} . '_packets'}); my $diff_loss = ($options{new_datas}->{$self->{instance} . '_loss'} - $options{old_datas}->{$self->{instance} . '_loss'}); @@ -63,22 +63,20 @@ sub set_counters { $self->{maps_counters}->{channels} = [ { label => 'channel-traffic-in', nlabel => 'call.channel.traffic.in.bytes', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 1, output_template => 'traffic in: %s %s/s', perfdatas => [ - { value => 'traffic_in_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1 }, + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } }, { label => 'channel-traffic-out', nlabel => 'call.channel.traffic.out.bytes', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], + output_change_bytes => 1, output_template => 'traffic out: %s %s/s', perfdatas => [ - { value => 'traffic_out_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1 }, + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } }, @@ -86,8 +84,7 @@ sub set_counters { key_values => [ { name => 'max_jitter' }, { name => 'display' } ], output_template => 'max jitter: %s ms', perfdatas => [ - { value => 'max_jitter_absolute', template => '%d', - unit => 'ms', min => 0, label_extra_instance => 1 }, + { template => '%d', unit => 'ms', min => 0, label_extra_instance => 1 }, ], } }, @@ -97,8 +94,7 @@ sub set_counters { closure_custom_output => $self->can('custom_loss_output'), threshold_use => 'packets_loss', perfdatas => [ - { value => 'packets_loss', template => '%d', - min => 0, label_extra_instance => 1 }, + { value => 'packets_loss', template => '%d', min => 0, label_extra_instance => 1 } ], } }, @@ -108,11 +104,10 @@ sub set_counters { closure_custom_output => $self->can('custom_loss_output'), threshold_use => 'packets_loss_prct', perfdatas => [ - { value => 'packets_loss_prct', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1 }, - ], + { value => 'packets_loss_prct', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 } + ] } - }, + } ]; } diff --git a/hardware/devices/polycom/trio/restapi/mode/callssummary.pm b/hardware/devices/polycom/trio/restapi/mode/callssummary.pm index 1021d580e..bd4e22b1c 100644 --- a/hardware/devices/polycom/trio/restapi/mode/callssummary.pm +++ b/hardware/devices/polycom/trio/restapi/mode/callssummary.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total: d', perfdatas => [ - { value => 'total_absolute', template => '%d', min => 0 }, + { value => 'total', template => '%d', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'placed' } ], output_template => 'placed: %d', perfdatas => [ - { value => 'placed_absolute', template => '%d', min => 0 }, + { value => 'placed', template => '%d', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'missed' } ], output_template => 'missed: %d', perfdatas => [ - { value => 'missed_absolute', template => '%d', min => 0 }, + { value => 'missed', template => '%d', min => 0 }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'received' } ], output_template => 'received: %d', perfdatas => [ - { value => 'received_absolute', template => '%d', min => 0 }, + { value => 'received', template => '%d', min => 0 }, ], } }, diff --git a/hardware/devices/polycom/trio/restapi/mode/device.pm b/hardware/devices/polycom/trio/restapi/mode/device.pm index f84a23b1e..d661e38c5 100644 --- a/hardware/devices/polycom/trio/restapi/mode/device.pm +++ b/hardware/devices/polycom/trio/restapi/mode/device.pm @@ -37,11 +37,11 @@ sub custom_memory_output { return sprintf( "memory total: %s %s used: %s %s (%.2f%%) free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'cpu_average' } ], output_template => 'cpu average: %.2f%%', perfdatas => [ - { value => 'cpu_average_absolute', template => '%.2f', + { value => 'cpu_average', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -75,7 +75,7 @@ sub set_counters { { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_memory_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -85,7 +85,7 @@ sub set_counters { { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_memory_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Memory Used: %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/hardware/devices/polycom/trio/restapi/mode/network.pm b/hardware/devices/polycom/trio/restapi/mode/network.pm index 1b903de93..01ee05be4 100644 --- a/hardware/devices/polycom/trio/restapi/mode/network.pm +++ b/hardware/devices/polycom/trio/restapi/mode/network.pm @@ -35,21 +35,19 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'packets-in', nlabel => 'network.packets.in.persecond', set => { - key_values => [ { name => 'packets_in', diff => 1 } ], + key_values => [ { name => 'packets_in', per_second => 1 } ], output_template => 'packets in: %.2f/s', - per_second => 1, perfdatas => [ - { value => 'packets_in_per_second', template => '%.2f', min => 0, unit => '/s' }, + { template => '%.2f', min => 0, unit => '/s' } ], } }, { label => 'packets-out', nlabel => 'network.packets.out.persecond', set => { - key_values => [ { name => 'packets_out', diff => 1 } ], + key_values => [ { name => 'packets_out', per_second => 1 } ], output_template => 'packets out: %.2f/s', - per_second => 1, perfdatas => [ - { value => 'packets_out_per_second', template => '%.2f', min => 0, unit => '/s' }, - ], + { template => '%.2f', min => 0, unit => '/s' } + ] } } ]; diff --git a/hardware/devices/timelinkmicro/tms6001/snmp/mode/alarms.pm b/hardware/devices/timelinkmicro/tms6001/snmp/mode/alarms.pm index d89a21330..6194fae99 100644 --- a/hardware/devices/timelinkmicro/tms6001/snmp/mode/alarms.pm +++ b/hardware/devices/timelinkmicro/tms6001/snmp/mode/alarms.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'alarms_count' } ], output_template => 'current number of alarms: %s', perfdatas => [ - { value => 'alarms_count_absolute', template => '%s', min => 0 } + { value => 'alarms_count', template => '%s', min => 0 } ] } } diff --git a/hardware/devices/timelinkmicro/tms6001/snmp/mode/frequency.pm b/hardware/devices/timelinkmicro/tms6001/snmp/mode/frequency.pm index 11072dd37..d09d7f52d 100644 --- a/hardware/devices/timelinkmicro/tms6001/snmp/mode/frequency.pm +++ b/hardware/devices/timelinkmicro/tms6001/snmp/mode/frequency.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'qual_frequency' } ], output_template => 'quality of frequency generation: %s', perfdatas => [ - { value => 'qual_frequency_absolute', template => '%s' } + { value => 'qual_frequency', template => '%s' } ] } } diff --git a/hardware/devices/timelinkmicro/tms6001/snmp/mode/satellites.pm b/hardware/devices/timelinkmicro/tms6001/snmp/mode/satellites.pm index 533a72e85..f1dd16151 100644 --- a/hardware/devices/timelinkmicro/tms6001/snmp/mode/satellites.pm +++ b/hardware/devices/timelinkmicro/tms6001/snmp/mode/satellites.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'sat_count' } ], output_template => 'current number of satellites seen: %s', perfdatas => [ - { value => 'sat_count_absolute', template => '%s', min => 0 } + { value => 'sat_count', template => '%s', min => 0 } ] } } diff --git a/hardware/devices/timelinkmicro/tms6001/snmp/mode/time.pm b/hardware/devices/timelinkmicro/tms6001/snmp/mode/time.pm index c9c5b06f8..7eb31f6df 100644 --- a/hardware/devices/timelinkmicro/tms6001/snmp/mode/time.pm +++ b/hardware/devices/timelinkmicro/tms6001/snmp/mode/time.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'qual_time' } ], output_template => 'quality of time generation: %s', perfdatas => [ - { value => 'qual_time_absolute', template => '%s' } + { value => 'qual_time', template => '%s' } ] } } diff --git a/hardware/kvm/adder/aim/snmp/mode/deviceusage.pm b/hardware/kvm/adder/aim/snmp/mode/deviceusage.pm index 0c6d8e9ed..30415b997 100644 --- a/hardware/kvm/adder/aim/snmp/mode/deviceusage.pm +++ b/hardware/kvm/adder/aim/snmp/mode/deviceusage.pm @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total devices : %s', perfdatas => [ - { label => 'devices_total', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'devices_total', value => 'total', template => '%s', min => 0 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'online' }, { name => 'total' } ], output_template => 'Online devices : %s', perfdatas => [ - { label => 'devices_online', value => 'online_absolute', template => '%s', min => 0, max => 'total_absolute' }, + { label => 'devices_online', value => 'online', template => '%s', min => 0, max => 'total' }, ], } }, diff --git a/hardware/kvm/adder/aim/snmp/mode/serverusage.pm b/hardware/kvm/adder/aim/snmp/mode/serverusage.pm index f08b174e2..3036e3b3c 100644 --- a/hardware/kvm/adder/aim/snmp/mode/serverusage.pm +++ b/hardware/kvm/adder/aim/snmp/mode/serverusage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu_load' } ], output_template => 'CPU Load : %s', perfdatas => [ - { label => 'cpu_load', value => 'cpu_load_absolute', template => '%s', min => 0 }, + { label => 'cpu_load', value => 'cpu_load', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'memory_used' } ], output_template => 'Memory Used : %s %%', perfdatas => [ - { label => 'memory_used', value => 'memory_used_absolute', template => '%s', + { label => 'memory_used', value => 'memory_used', template => '%s', unit => '%', min => 0, max => 100 }, ], } @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'disk_used' } ], output_template => 'Disk Used : %s %%', perfdatas => [ - { label => 'disk_used', value => 'disk_used_absolute', template => '%s', + { label => 'disk_used', value => 'disk_used', template => '%s', unit => '%', min => 0, max => 100 }, ], } @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'num_active_con' } ], output_template => 'Current Connected Rx : %s', perfdatas => [ - { label => 'num_active_con', value => 'num_active_con_absolute', template => '%s', min => 0}, + { label => 'num_active_con', value => 'num_active_con', template => '%s', min => 0}, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'num_rx' } ], output_template => 'Number Rx : %s', perfdatas => [ - { label => 'num_rx', value => 'num_rx_absolute', template => '%s', min => 0 }, + { label => 'num_rx', value => 'num_rx', template => '%s', min => 0 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'num_tx' } ], output_template => 'Numbre Tx : %s', perfdatas => [ - { label => 'num_tx', value => 'num_tx_absolute', template => '%s', min => 0 }, + { label => 'num_tx', value => 'num_tx', template => '%s', min => 0 }, ], } }, diff --git a/hardware/kvm/avocent/acs/8000/snmp/mode/serialports.pm b/hardware/kvm/avocent/acs/8000/snmp/mode/serialports.pm index 152a73e9c..61473a751 100644 --- a/hardware/kvm/avocent/acs/8000/snmp/mode/serialports.pm +++ b/hardware/kvm/avocent/acs/8000/snmp/mode/serialports.pm @@ -53,22 +53,20 @@ sub set_counters { } }, { label => 'traffic-in', nlabel => 'serialport.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-out', nlabel => 'serialport.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'traffic out: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/hardware/pdu/apc/snmp/mode/load.pm b/hardware/pdu/apc/snmp/mode/load.pm index ab1bc83a5..26804b839 100644 --- a/hardware/pdu/apc/snmp/mode/load.pm +++ b/hardware/pdu/apc/snmp/mode/load.pm @@ -63,8 +63,8 @@ sub set_counters { key_values => [ { name => 'current' }, { name => 'display' } ], output_template => 'current : %s A', perfdatas => [ - { label => 'current_bank', template => '%s', value => 'current_absolute', - unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_bank', template => '%s', value => 'current', + unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'current' }, { name => 'display' } ], output_template => 'current : %s A', perfdatas => [ - { label => 'current_phase', template => '%s', value => 'current_absolute', - unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_phase', template => '%s', value => 'current', + unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'power' }, { name => 'display' } ], output_template => 'power : %s W', perfdatas => [ - { label => 'power_phase', template => '%s', value => 'power_absolute', - unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'power_phase', template => '%s', value => 'power', + unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -104,8 +104,8 @@ sub set_counters { key_values => [ { name => 'power' }, { name => 'display' } ], output_template => 'power : %s W', perfdatas => [ - { label => 'power_phase', template => '%s', value => 'power_absolute', - unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'power_phase', template => '%s', value => 'power', + unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/pdu/apc/snmp/mode/outlet.pm b/hardware/pdu/apc/snmp/mode/outlet.pm index 0739a35e7..34b20dbb0 100644 --- a/hardware/pdu/apc/snmp/mode/outlet.pm +++ b/hardware/pdu/apc/snmp/mode/outlet.pm @@ -68,8 +68,8 @@ sub set_counters { key_values => [ { name => 'current', no_value => 0 }, { name => 'display' } ], output_template => 'current : %s A', perfdatas => [ - { label => 'current', template => '%s', value => 'current_absolute', - unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current', template => '%s', value => 'current', + unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/pdu/clever/snmp/mode/psusage.pm b/hardware/pdu/clever/snmp/mode/psusage.pm index a283b9318..93dbcd542 100644 --- a/hardware/pdu/clever/snmp/mode/psusage.pm +++ b/hardware/pdu/clever/snmp/mode/psusage.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'power' } ], output_template => 'Input power : %s W', perfdatas => [ - { label => 'power', value => 'power_absolute', template => '%s', + { label => 'power', value => 'power', template => '%s', unit => 'W', min => 0 }, ], } @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'Current : %s A', perfdatas => [ - { label => 'current', value => 'current_absolute', template => '%s', + { label => 'current', value => 'current', template => '%s', unit => 'A', min => 0 }, ], } @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'Voltage : %s V', perfdatas => [ - { label => 'voltage', value => 'voltage_absolute', template => '%s', + { label => 'voltage', value => 'voltage', template => '%s', unit => 'V', min => 0 }, ], } diff --git a/hardware/pdu/eaton/snmp/mode/environment.pm b/hardware/pdu/eaton/snmp/mode/environment.pm index 928d45fd2..2717decf1 100644 --- a/hardware/pdu/eaton/snmp/mode/environment.pm +++ b/hardware/pdu/eaton/snmp/mode/environment.pm @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'value' }, { name => 'display' } ], output_template => 'temperature %.1f C', perfdatas => [ - { value => 'value_absolute', template => '%.1f', + { value => 'value', template => '%.1f', unit => 'C', label_extra_instance => 1 }, ], } @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'value' }, { name => 'display' } ], output_template => 'humidity %.2f %%', perfdatas => [ - { value => 'value_absolute', template => '%.2f', + { value => 'value', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } diff --git a/hardware/pdu/eaton/snmp/mode/group.pm b/hardware/pdu/eaton/snmp/mode/group.pm index 2a11324eb..e496d5a0b 100644 --- a/hardware/pdu/eaton/snmp/mode/group.pm +++ b/hardware/pdu/eaton/snmp/mode/group.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'groupCurrent', no_value => 0 }, { name => 'display' } ], output_template => 'Current : %.2f A', perfdatas => [ - { value => 'groupCurrent_absolute', template => '%.2f', - min => 0, unit => 'A', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'groupCurrent', template => '%.2f', + min => 0, unit => 'A', label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'groupVoltage', no_value => 0 }, { name => 'display' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'groupVoltage_absolute', template => '%.2f', - unit => 'V', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'groupVoltage', template => '%.2f', + unit => 'V', label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'groupWatts', no_value => 0 }, { name => 'display' } ], output_template => 'Power : %.2f W', perfdatas => [ - { value => 'groupWatts_absolute', template => '%.2f', - unit => 'W', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'groupWatts', template => '%.2f', + unit => 'W', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/hardware/pdu/eaton/snmp/mode/outlet.pm b/hardware/pdu/eaton/snmp/mode/outlet.pm index 0583c293e..544ba2b67 100644 --- a/hardware/pdu/eaton/snmp/mode/outlet.pm +++ b/hardware/pdu/eaton/snmp/mode/outlet.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'outletCurrent', no_value => 0 }, { name => 'display' } ], output_template => 'Current : %.2f A', perfdatas => [ - { value => 'outletCurrent_absolute', template => '%.2f', - min => 0, unit => 'A', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'outletCurrent', template => '%.2f', + min => 0, unit => 'A', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'outletVoltage', no_value => 0 }, { name => 'display' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'outletVoltage_absolute', template => '%.2f', - unit => 'V', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'outletVoltage', template => '%.2f', + unit => 'V', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'outletWatts', no_value => 0 }, { name => 'display' } ], output_template => 'Power : %.2f W', perfdatas => [ - { value => 'outletWatts_absolute', template => '%.2f', - unit => 'W', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'outletWatts', template => '%.2f', + unit => 'W', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/pdu/emerson/snmp/mode/psusage.pm b/hardware/pdu/emerson/snmp/mode/psusage.pm index f1936a25b..e473c9a32 100644 --- a/hardware/pdu/emerson/snmp/mode/psusage.pm +++ b/hardware/pdu/emerson/snmp/mode/psusage.pm @@ -43,7 +43,7 @@ sub set_counters { key_values => [ { name => 'PwrTotal' } ], output_template => 'Total input power : %s W', output_error_template => "total input power : %s", perfdatas => [ - { label => 'power', value => 'PwrTotal_absolute', template => '%s', + { label => 'power', value => 'PwrTotal', template => '%s', unit => 'W', min => 0, label_extra_instance => 1 }, ], } @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'EnergyAccum', diff => 1 } ], output_template => 'Total energy : %.3f kWh', output_error_template => "Total energy : %s", perfdatas => [ - { label => 'energy', value => 'EnergyAccum_absolute', template => '%.3f', + { label => 'energy', value => 'EnergyAccum', template => '%.3f', unit => 'kWh', min => 0, label_extra_instance => 1 }, ], } @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'EcNeutral' } ], output_template => 'Current neutral : %s Amp AC RMS', output_error_template => "Current neutral : %s", perfdatas => [ - { label => 'current_neutral', value => 'EcNeutral_absolute', template => '%s', + { label => 'current_neutral', value => 'EcNeutral', template => '%s', unit => 'AmpAcRMS', min => 0, label_extra_instance => 1 }, ], } @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'load' } ], output_template => 'Load : %.2f %%', output_error_template => "Load : %s", perfdatas => [ - { label => 'line_load', value => 'load_absolute', template => '%.2f', + { label => 'line_load', value => 'load', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'current' }], output_template => 'Current : %.2f A', output_error_template => "Current : %s", perfdatas => [ - { label => 'line_current', value => 'current_absolute', template => '%.2f', + { label => 'line_current', value => 'current', template => '%.2f', unit => 'A', min => 0, label_extra_instance => 1 }, ], } diff --git a/hardware/pdu/emerson/snmp/mode/receptacles.pm b/hardware/pdu/emerson/snmp/mode/receptacles.pm index b47ce0196..685424d9c 100644 --- a/hardware/pdu/emerson/snmp/mode/receptacles.pm +++ b/hardware/pdu/emerson/snmp/mode/receptacles.pm @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'lgpPduRbEntryEnergyAccum', diff => 1 } ], output_template => 'total input power : %s kWh', perfdatas => [ - { template => '%s', value => 'lgpPduRbEntryEnergyAccum_absolute', + { template => '%s', value => 'lgpPduRbEntryEnergyAccum', unit => 'kWh', min => 0, label_extra_instance => 1 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'lgpPduRbEntryPwr' } ], output_template => 'line-to-neutral real power : %s W', perfdatas => [ - { template => '%s', value => 'lgpPduRbEntryPwr_absolute', + { template => '%s', value => 'lgpPduRbEntryPwr', unit => 'W', min => 0, label_extra_instance => 1 }, ], } @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => 'lgpPduRbEntryAp' } ], output_template => 'line-to-neutral apparent power : %s VA', perfdatas => [ - { template => '%s', value => 'lgpPduRbEntryAp_absolute', + { template => '%s', value => 'lgpPduRbEntryAp', unit => 'VA', min => 0, label_extra_instance => 1 }, ], } @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => 'lgpPduRbEntryEcHundredths' } ], output_template => 'line-to-neutral current : %s Amp AC RMS', perfdatas => [ - { value => 'lgpPduRbEntryEcHundredths_absolute', template => '%s', + { value => 'lgpPduRbEntryEcHundredths', template => '%s', unit => 'AmpAcRMS', min => 0, label_extra_instance => 1 }, ], } @@ -91,7 +91,7 @@ sub set_counters { key_values => [ { name => 'lgpPduRbEntryEpLNTenths' } ], output_template => 'line-to-neutral potential : %s VoltRMS', perfdatas => [ - { value => 'lgpPduRbEntryEpLNTenths_absolute', template => '%s', + { value => 'lgpPduRbEntryEpLNTenths', template => '%s', unit => 'VoltRMS', min => 0, label_extra_instance => 1 }, ], } diff --git a/hardware/sensors/comet/p8000/snmp/mode/sensors.pm b/hardware/sensors/comet/p8000/snmp/mode/sensors.pm index de43b1399..6ac912565 100644 --- a/hardware/sensors/comet/p8000/snmp/mode/sensors.pm +++ b/hardware/sensors/comet/p8000/snmp/mode/sensors.pm @@ -30,13 +30,13 @@ sub custom_temperature_perfdata { my ($extra_label, $unit) = ('', 'C'); if (!defined($options{extra_instance}) || $options{extra_instance} != 0) { - $extra_label .= '_' . $self->{result_values}->{display_absolute}; + $extra_label .= '_' . $self->{result_values}->{display}; } $self->{output}->perfdata_add( label => $self->{label} . $extra_label, unit => $unit, - value => $self->{result_values}->{$self->{label} . '_absolute'}, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}), + value => $self->{result_values}->{$self->{label} }, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display}), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display}), ); } @@ -45,13 +45,13 @@ sub custom_humidity_perfdata { my ($extra_label, $unit) = ('', '%'); if (!defined($options{extra_instance}) || $options{extra_instance} != 0) { - $extra_label .= '_' . $self->{result_values}->{display_absolute}; + $extra_label .= '_' . $self->{result_values}->{display}; } $self->{output}->perfdata_add( label => $self->{label} . $extra_label, unit => $unit, - value => $self->{result_values}->{$self->{label} . '_absolute'}, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}), + value => $self->{result_values}->{$self->{label} }, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display}), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display}), min => 0, max => 100, ); } @@ -63,17 +63,17 @@ sub custom_sensor_threshold { if (defined($self->{instance_mode}->{option_results}->{'warning-' . $self->{label}}) && $self->{instance_mode}->{option_results}->{'warning-' . $self->{label}} ne '') { $warn_limit = $self->{instance_mode}->{option_results}->{'warning-' . $self->{label}}; } - $self->{perfdata}->threshold_validate(label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}, value => $warn_limit); + $self->{perfdata}->threshold_validate(label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display}, value => $warn_limit); - my $crit_limit = $self->{result_values}->{limit_lo_absolute} . ':' . $self->{result_values}->{limit_hi_absolute}; + my $crit_limit = $self->{result_values}->{limit_lo} . ':' . $self->{result_values}->{limit_hi}; if (defined($self->{instance_mode}->{option_results}->{'critical-' . $self->{label}}) && $self->{instance_mode}->{option_results}->{'critical-' . $self->{label}} ne '') { $crit_limit = $self->{instance_mode}->{option_results}->{'critical-' . $self->{label}}; } - $self->{perfdata}->threshold_validate(label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}, value => $crit_limit); + $self->{perfdata}->threshold_validate(label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display}, value => $crit_limit); - my $exit = $self->{perfdata}->threshold_check(value => $self->{result_values}->{$self->{label} . '_absolute'}, - threshold => [ { label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}, exit_litteral => 'critical' }, - { label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display_absolute}, exit_litteral => 'warning' } ]); + my $exit = $self->{perfdata}->threshold_check(value => $self->{result_values}->{$self->{label} }, + threshold => [ { label => 'critical-' . $self->{label} . '_' . $self->{result_values}->{display}, exit_litteral => 'critical' }, + { label => 'warning-' . $self->{label} . '_' . $self->{result_values}->{display}, exit_litteral => 'warning' } ]); return $exit; } diff --git a/hardware/sensors/geist/snmp/mode/sensors.pm b/hardware/sensors/geist/snmp/mode/sensors.pm index 140efd117..ac3cc2478 100644 --- a/hardware/sensors/geist/snmp/mode/sensors.pm +++ b/hardware/sensors/geist/snmp/mode/sensors.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'climateTempC', no_value => 0, } ], output_template => 'temperature %s C', perfdatas => [ - { value => 'climateTempC_absolute', template => '%s', unit => 'C', label_extra_instance => 1 }, + { value => 'climateTempC', template => '%s', unit => 'C', label_extra_instance => 1 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'climateHumidity', no_value => 0 } ], output_template => 'humidity %.2f %%', perfdatas => [ - { value => 'climateHumidity_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, + { value => 'climateHumidity', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'climateLight', no_value => 0 } ], output_template => 'ambient light %.2f %%', perfdatas => [ - { value => 'climateLight_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, + { value => 'climateLight', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'climateAirflow', no_value => 0 } ], output_template => 'airflow %.2f %%', perfdatas => [ - { value => 'climateAirflow_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, + { value => 'climateAirflow', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'climateSound', no_value => 0 } ], output_template => 'sound %.2f %%', perfdatas => [ - { value => 'climateSound_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, + { value => 'climateSound', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } }, @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'climateDewPointC', no_value => 0 } ], output_template => 'dew point %s C', perfdatas => [ - { value => 'climateDewPointC_absolute', template => '%s', unit => 'C', label_extra_instance => 1 }, + { value => 'climateDewPointC', template => '%s', unit => 'C', label_extra_instance => 1 }, ], } }, @@ -90,7 +90,7 @@ sub set_counters { key_values => [ { name => 'internalTemp', no_value => 0, } ], output_template => 'temperature %s C', perfdatas => [ - { value => 'internalTemp_absolute', template => '%s', unit => 'C', label_extra_instance => 1 }, + { value => 'internalTemp', template => '%s', unit => 'C', label_extra_instance => 1 }, ], } }, @@ -98,7 +98,7 @@ sub set_counters { key_values => [ { name => 'internalHumidity', no_value => 0 } ], output_template => 'humidity %.2f %%', perfdatas => [ - { value => 'internalHumidity_absolute', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, + { value => 'internalHumidity', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } }, @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'internalDewPoint', no_value => 0 } ], output_template => 'dew point %s C', perfdatas => [ - { value => 'internalDewPoint_absolute', template => '%s', unit => 'C', label_extra_instance => 1 }, + { value => 'internalDewPoint', template => '%s', unit => 'C', label_extra_instance => 1 }, ], } }, diff --git a/hardware/sensors/temperhum/local/mode/environment.pm b/hardware/sensors/temperhum/local/mode/environment.pm index 3d957e35f..420d7ede6 100644 --- a/hardware/sensors/temperhum/local/mode/environment.pm +++ b/hardware/sensors/temperhum/local/mode/environment.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'humidity' }, { name => 'display' } ], output_template => 'Humidity: %.2f%%', perfdatas => [ - { label => 'humidity', value => 'humidity_absolute', template => '%.2f', - unit => '%', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'humidity', value => 'humidity', template => '%.2f', + unit => '%', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], }, }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'temperature' }, { name => 'dewpoint' }, { name => 'display' } ], output_template => 'Temperature: %.2f C', perfdatas => [ - { label => 'temperature', value => 'temperature_absolute', template => '%.2f', - unit => 'C', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'temperature', value => 'temperature', template => '%.2f', + unit => 'C', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], }, }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'dewpoint' }, { name => 'display' } ], output_template => 'Dew Point : %.2f C', perfdatas => [ - { label => 'dew_point', value => 'dewpoint_absolute', template => '%.2f', - unit => 'C', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'dew_point', value => 'dewpoint', template => '%.2f', + unit => 'C', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'delta' }, { name => 'display' } ], output_template => 'Delta (Temp - Dew) : %.2f C', perfdatas => [ - { label => 'delta', value => 'delta_absolute', template => '%.2f', - unit => 'C', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'delta', value => 'delta', template => '%.2f', + unit => 'C', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/server/hp/oneview/restapi/mode/storagepools.pm b/hardware/server/hp/oneview/restapi/mode/storagepools.pm index de43346c6..0bdb6d474 100644 --- a/hardware/server/hp/oneview/restapi/mode/storagepools.pm +++ b/hardware/server/hp/oneview/restapi/mode/storagepools.pm @@ -36,13 +36,13 @@ sub custom_status_output { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space}); my $msg = sprintf('space usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space} ); return $msg; } @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'used_space' }, { name => 'free_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -76,8 +76,8 @@ sub set_counters { key_values => [ { name => 'free_space' }, { name => 'used_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'free_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -85,8 +85,8 @@ sub set_counters { key_values => [ { name => 'prct_used_space' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { value => 'prct_used_space_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used_space', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/telephony/avaya/aes/snmp/mode/services.pm b/hardware/telephony/avaya/aes/snmp/mode/services.pm index b94eb5184..19755d40e 100644 --- a/hardware/telephony/avaya/aes/snmp/mode/services.pm +++ b/hardware/telephony/avaya/aes/snmp/mode/services.pm @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'avAesTsapiClientsConnected' } ], output_template => 'client connected: %s', perfdatas => [ - { value => 'avAesTsapiClientsConnected_absolute', template => '%s', min => 0 }, + { value => 'avAesTsapiClientsConnected', template => '%s', min => 0 }, ], } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'mem_used_prct' } ], output_template => 'memory used : %.2f %%', perfdatas => [ - { value => 'mem_used_prct_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'mem_used_prct', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/hardware/telephony/avaya/cm/snmp/mode/calls.pm b/hardware/telephony/avaya/cm/snmp/mode/calls.pm index c81d9af49..bbdb82e4f 100644 --- a/hardware/telephony/avaya/cm/snmp/mode/calls.pm +++ b/hardware/telephony/avaya/cm/snmp/mode/calls.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'avCmListMeasCallRateTotalNumCallsCompLstHr' } ], output_template => 'total calls last hour: %s', perfdatas => [ - { value => 'avCmListMeasCallRateTotalNumCallsCompLstHr_absolute', template => '%s', min => 0 }, + { value => 'avCmListMeasCallRateTotalNumCallsCompLstHr', template => '%s', min => 0 }, ], } } diff --git a/hardware/telephony/avaya/cm/snmp/mode/licenses.pm b/hardware/telephony/avaya/cm/snmp/mode/licenses.pm index d5ce337c9..3d8001978 100644 --- a/hardware/telephony/avaya/cm/snmp/mode/licenses.pm +++ b/hardware/telephony/avaya/cm/snmp/mode/licenses.pm @@ -29,11 +29,11 @@ sub custom_station_output { my ($self, %options) = @_; my $msg = sprintf("station capacity total: %s used: %s (%.2f%%) free: %s (%.2f%%)", - $self->{result_values}->{total_absolute}, - $self->{result_values}->{used_absolute}, - $self->{result_values}->{prct_used_absolute}, - $self->{result_values}->{free_absolute}, - $self->{result_values}->{prct_free_absolute} + $self->{result_values}->{total}, + $self->{result_values}->{used}, + $self->{result_values}->{prct_used}, + $self->{result_values}->{free}, + $self->{result_values}->{prct_free} ); return $msg; } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_station_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', cast_int => 1 }, + { value => 'used', template => '%d', min => 0, max => 'total', cast_int => 1 }, ], } }, @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_station_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', cast_int => 1 }, + { value => 'free', template => '%d', min => 0, max => 'total', cast_int => 1 }, ], } }, @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'station capacity used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } } diff --git a/hardware/ups/alpha/snmp/mode/batterystatus.pm b/hardware/ups/alpha/snmp/mode/batterystatus.pm index 8014a18f4..1d03d7c83 100644 --- a/hardware/ups/alpha/snmp/mode/batterystatus.pm +++ b/hardware/ups/alpha/snmp/mode/batterystatus.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'upsBatteryCapacity' } ], output_template => 'Remaining capacity : %s %%', perfdatas => [ - { label => 'load', value => 'upsBatteryCapacity_absolute', template => '%s', + { label => 'load', value => 'upsBatteryCapacity', template => '%s', min => 0, max => 100, unit => '%' }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'upsBatteryChargingCurrent' } ], output_template => 'Current : %s A', perfdatas => [ - { label => 'current', value => 'upsBatteryChargingCurrent_absolute', template => '%s', + { label => 'current', value => 'upsBatteryChargingCurrent', template => '%s', min => 0, unit => 'A' }, ], } @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'upsBatteryVoltage' } ], output_template => 'Voltage : %s V', perfdatas => [ - { label => 'voltage', value => 'upsBatteryVoltage_absolute', template => '%s', + { label => 'voltage', value => 'upsBatteryVoltage', template => '%s', unit => 'V' }, ], } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'upsBatteryTemperature' } ], output_template => 'Temperature : %s C', perfdatas => [ - { label => 'temperature', value => 'upsBatteryTemperature_absolute', template => '%s', + { label => 'temperature', value => 'upsBatteryTemperature', template => '%s', unit => 'C'}, ], } diff --git a/hardware/ups/apc/snmp/mode/batterystatus.pm b/hardware/ups/apc/snmp/mode/batterystatus.pm index 741b201c7..823548796 100644 --- a/hardware/ups/apc/snmp/mode/batterystatus.pm +++ b/hardware/ups/apc/snmp/mode/batterystatus.pm @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'upsAdvBatteryCapacity' } ], output_template => 'remaining capacity: %s %%', perfdatas => [ - { label => 'load', value => 'upsAdvBatteryCapacity_absolute', template => '%s', + { label => 'load', value => 'upsAdvBatteryCapacity', template => '%s', min => 0, max => 100, unit => '%' }, ], } @@ -80,7 +80,7 @@ sub set_counters { key_values => [ { name => 'upsAdvBatteryRunTimeRemaining' } ], output_template => 'remaining time: %.2f minutes', perfdatas => [ - { label => 'load_time', value => 'upsAdvBatteryRunTimeRemaining_absolute', template => '%.2f', + { label => 'load_time', value => 'upsAdvBatteryRunTimeRemaining', template => '%.2f', min => 0, unit => 'm' }, ], } @@ -89,7 +89,7 @@ sub set_counters { key_values => [ { name => 'upsAdvBatteryCurrent' } ], output_template => 'current: %s A', perfdatas => [ - { label => 'current', value => 'upsAdvBatteryCurrent_absolute', template => '%s', + { label => 'current', value => 'upsAdvBatteryCurrent', template => '%s', min => 0, unit => 'A' }, ], } @@ -98,7 +98,7 @@ sub set_counters { key_values => [ { name => 'upsAdvBatteryActualVoltage' } ], output_template => 'voltage: %s V', perfdatas => [ - { label => 'voltage', value => 'upsAdvBatteryActualVoltage_absolute', template => '%s', + { label => 'voltage', value => 'upsAdvBatteryActualVoltage', template => '%s', unit => 'V' }, ], } @@ -107,7 +107,7 @@ sub set_counters { key_values => [ { name => 'upsAdvBatteryTemperature' } ], output_template => 'temperature: %s C', perfdatas => [ - { label => 'temperature', value => 'upsAdvBatteryTemperature_absolute', template => '%s', + { label => 'temperature', value => 'upsAdvBatteryTemperature', template => '%s', unit => 'C'}, ], } @@ -116,7 +116,7 @@ sub set_counters { key_values => [ { name => 'last_replace_time' } ], output_template => 'replace last time: %s s', perfdatas => [ - { label => 'replace_last_time', value => 'last_replace_time_absolute', template => '%s', + { label => 'replace_last_time', value => 'last_replace_time', template => '%s', unit => 's'}, ], } diff --git a/hardware/ups/apc/snmp/mode/inputlines.pm b/hardware/ups/apc/snmp/mode/inputlines.pm index a131232e3..ae962021c 100644 --- a/hardware/ups/apc/snmp/mode/inputlines.pm +++ b/hardware/ups/apc/snmp/mode/inputlines.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'voltage: %s V', perfdatas => [ - { label => 'voltage', value => 'voltage_absolute', template => '%s', + { label => 'voltage', value => 'voltage', template => '%s', unit => 'V' }, ], } @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'frequency' } ], output_template => 'frequence: %s Hz', perfdatas => [ - { label => 'frequence', value => 'frequency_absolute', template => '%s', + { label => 'frequence', value => 'frequency', template => '%s', unit => 'Hz' }, ], } diff --git a/hardware/ups/apc/snmp/mode/outputlines.pm b/hardware/ups/apc/snmp/mode/outputlines.pm index a4aa76339..a1e1a9096 100644 --- a/hardware/ups/apc/snmp/mode/outputlines.pm +++ b/hardware/ups/apc/snmp/mode/outputlines.pm @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'load' } ], output_template => 'load: %s %%', perfdatas => [ - { label => 'load', value => 'load_absolute', template => '%s', + { label => 'load', value => 'load', template => '%s', min => 0, max => 100, unit => '%' }, ], } @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'current' } ], output_template => 'current: %s A', perfdatas => [ - { label => 'current', value => 'current_absolute', template => '%s', + { label => 'current', value => 'current', template => '%s', min => 0, unit => 'A' }, ], } @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'voltage' } ], output_template => 'voltage: %s V', perfdatas => [ - { label => 'voltage', value => 'voltage_absolute', template => '%s', + { label => 'voltage', value => 'voltage', template => '%s', unit => 'V' }, ], } @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'frequency' } ], output_template => 'frequence: %s Hz', perfdatas => [ - { label => 'frequence', value => 'frequency_absolute', template => '%s', + { label => 'frequence', value => 'frequency', template => '%s', unit => 'Hz' }, ], } diff --git a/hardware/ups/hp/snmp/mode/batterystatus.pm b/hardware/ups/hp/snmp/mode/batterystatus.pm index 1f44938a5..835392ae3 100644 --- a/hardware/ups/hp/snmp/mode/batterystatus.pm +++ b/hardware/ups/hp/snmp/mode/batterystatus.pm @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'upsBatCapacity' } ], output_template => 'remaining capacity: %s %%', perfdatas => [ - { value => 'upsBatCapacity_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { value => 'upsBatCapacity', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'upsBatTimeRemaining' } ], output_template => 'remaining time: %s minutes', perfdatas => [ - { value => 'upsBatTimeRemaining_absolute', template => '%s', min => 0, unit => 'm' }, + { value => 'upsBatTimeRemaining', template => '%s', min => 0, unit => 'm' }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'upsBatCurrent', no_value => 0 } ], output_template => 'current: %s A', perfdatas => [ - { value => 'upsBatCurrent_absolute', template => '%s', unit => 'A' }, + { value => 'upsBatCurrent', template => '%s', unit => 'A' }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'upsBatVoltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'upsBatVoltage_absolute', template => '%s', unit => 'V' }, + { value => 'upsBatVoltage', template => '%s', unit => 'V' }, ], } }, diff --git a/hardware/ups/hp/snmp/mode/environment.pm b/hardware/ups/hp/snmp/mode/environment.pm index ec41ff317..ec5a969dc 100644 --- a/hardware/ups/hp/snmp/mode/environment.pm +++ b/hardware/ups/hp/snmp/mode/environment.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'internal_temperature' } ], output_template => 'internal temperature: %.2f C', perfdatas => [ - { value => 'internal_temperature_absolute', template => '%.2f', + { value => 'internal_temperature', template => '%.2f', min => 0, unit => 'C' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'internal_humidity' } ], output_template => 'internal humidity: %.2f %%', perfdatas => [ - { value => 'internal_humidity_absolute', template => '%.2f', + { value => 'internal_humidity', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'remote_temperature' } ], output_template => 'remote temperature: %.2f C', perfdatas => [ - { value => 'remote_temperature_absolute', template => '%.2f', + { value => 'remote_temperature', template => '%.2f', min => 0, unit => 'C' }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'remote_humidity' } ], output_template => 'remote humidity: %.2f %%', perfdatas => [ - { value => 'remote_humidity_absolute', template => '%.2f', + { value => 'remote_humidity', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/hardware/ups/hp/snmp/mode/inputlines.pm b/hardware/ups/hp/snmp/mode/inputlines.pm index 04350a663..48971438e 100644 --- a/hardware/ups/hp/snmp/mode/inputlines.pm +++ b/hardware/ups/hp/snmp/mode/inputlines.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'upsInputFrequency', no_value => 0 } ], output_template => 'frequence: %.2f Hz', perfdatas => [ - { value => 'upsInputFrequency_absolute', template => '%.2f', + { value => 'upsInputFrequency', template => '%.2f', unit => 'Hz' }, ], } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'upsInputCurrent', no_value => 0 } ], output_template => 'current: %.2f A', perfdatas => [ - { value => 'upsInputCurrent_absolute', template => '%.2f', + { value => 'upsInputCurrent', template => '%.2f', min => 0, unit => 'A', label_extra_instance => 1 }, ], } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'upsInputVoltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'upsInputVoltage_absolute', template => '%s', + { value => 'upsInputVoltage', template => '%s', unit => 'V', label_extra_instance => 1 }, ], } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'upsInputWatts', no_value => 0 } ], output_template => 'power: %s W', perfdatas => [ - { value => 'upsInputWatts_absolute', template => '%s', + { value => 'upsInputWatts', template => '%s', unit => 'W', label_extra_instance => 1 }, ], } diff --git a/hardware/ups/hp/snmp/mode/outputlines.pm b/hardware/ups/hp/snmp/mode/outputlines.pm index af37765fa..8ce324623 100644 --- a/hardware/ups/hp/snmp/mode/outputlines.pm +++ b/hardware/ups/hp/snmp/mode/outputlines.pm @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'upsOutputLoad', no_value => -1 } ], output_template => 'load: %.2f %%', perfdatas => [ - { value => 'upsOutputLoad_absolute', template => '%.2f', min => 0, max => 100 }, + { value => 'upsOutputLoad', template => '%.2f', min => 0, max => 100 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'upsOutputFrequency', no_value => 0 } ], output_template => 'frequence: %.2f Hz', perfdatas => [ - { value => 'upsOutputFrequency_absolute', template => '%.2f', unit => 'Hz' }, + { value => 'upsOutputFrequency', template => '%.2f', unit => 'Hz' }, ], } }, @@ -72,7 +72,7 @@ sub set_counters { key_values => [ { name => 'upsOutputCurrent', no_value => 0 } ], output_template => 'current: %.2f A', perfdatas => [ - { value => 'upsOutputCurrent_absolute', template => '%.2f', + { value => 'upsOutputCurrent', template => '%.2f', min => 0, unit => 'A', label_extra_instance => 1 }, ], } @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'upsOutputVoltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'upsOutputVoltage_absolute', template => '%s', + { value => 'upsOutputVoltage', template => '%s', unit => 'V', label_extra_instance => 1 }, ], } @@ -90,7 +90,7 @@ sub set_counters { key_values => [ { name => 'upsOutputWatts', no_value => 0 } ], output_template => 'power: %s W', perfdatas => [ - { value => 'upsOutputWatts_absolute', template => '%s', + { value => 'upsOutputWatts', template => '%s', unit => 'W', label_extra_instance => 1 }, ], } diff --git a/hardware/ups/mge/snmp/mode/environment.pm b/hardware/ups/mge/snmp/mode/environment.pm index 6da9a3409..88b53c73e 100644 --- a/hardware/ups/mge/snmp/mode/environment.pm +++ b/hardware/ups/mge/snmp/mode/environment.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'temperature', no_value => 0, } ], output_template => 'Ambiant Temperature: %.2f C', output_error_template => 'Ambiant Temperature: %s', perfdatas => [ - { value => 'temperature_absolute', label => 'temperature', template => '%.2f', + { value => 'temperature', label => 'temperature', template => '%.2f', unit => 'C' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'humidity', no_value => 0 } ], output_template => 'Humidity: %.2f %%', output_error_template => 'Humidity: %s', perfdatas => [ - { value => 'humidity_absolute', label => 'humidity', template => '%.2f', + { value => 'humidity', label => 'humidity', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/hardware/ups/mge/snmp/mode/inputlines.pm b/hardware/ups/mge/snmp/mode/inputlines.pm index 87fa7b0dd..da87f37e9 100644 --- a/hardware/ups/mge/snmp/mode/inputlines.pm +++ b/hardware/ups/mge/snmp/mode/inputlines.pm @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'mginputCurrent', no_value => 0 } ], output_template => 'Current : %.2f A', perfdatas => [ - { label => 'current', value => 'mginputCurrent_absolute', template => '%.2f', + { label => 'current', value => 'mginputCurrent', template => '%.2f', min => 0, unit => 'A', label_extra_instance => 1 }, ], } @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'mginputVoltage', no_value => 0 } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { label => 'voltage', value => 'mginputVoltage_absolute', template => '%.2f', + { label => 'voltage', value => 'mginputVoltage', template => '%.2f', unit => 'V', label_extra_instance => 1 }, ], } @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'mginputFrequency', no_value => 0 } ], output_template => 'Frequence : %.2f Hz', perfdatas => [ - { label => 'frequence', value => 'mginputFrequency_absolute', template => '%.2f', + { label => 'frequence', value => 'mginputFrequency', template => '%.2f', unit => 'Hz', label_extra_instance => 1 }, ], } diff --git a/hardware/ups/mge/snmp/mode/outputlines.pm b/hardware/ups/mge/snmp/mode/outputlines.pm index de2d9cb70..7f1806596 100644 --- a/hardware/ups/mge/snmp/mode/outputlines.pm +++ b/hardware/ups/mge/snmp/mode/outputlines.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'stdev' } ], output_template => 'Load Standard Deviation : %.2f', perfdatas => [ - { label => 'stdev', value => 'stdev_absolute', template => '%.2f' }, + { label => 'stdev', value => 'stdev', template => '%.2f' }, ], } }, @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'mgoutputLoadPerPhase', no_value => 0 } ], output_template => 'Load : %.2f %%', perfdatas => [ - { value => 'mgoutputLoadPerPhase_absolute', template => '%.2f', + { value => 'mgoutputLoadPerPhase', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'mgoutputCurrent', no_value => 0 } ], output_template => 'Current : %.2f A', perfdatas => [ - { value => 'mgoutputCurrent_absolute', template => '%.2f', + { value => 'mgoutputCurrent', template => '%.2f', min => 0, unit => 'A', label_extra_instance => 1 }, ], } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'mgoutputVoltage', no_value => 0 } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'mgoutputVoltage_absolute', template => '%.2f', + { value => 'mgoutputVoltage', template => '%.2f', unit => 'V', label_extra_instance => 1 }, ], } @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'mgoutputFrequency', no_value => -1 } ], output_template => 'Frequence : %.2f Hz', perfdatas => [ - { value => 'mgoutputFrequency_absolute', template => '%.2f', + { value => 'mgoutputFrequency', template => '%.2f', unit => 'Hz', label_extra_instance => 1 }, ], } diff --git a/hardware/ups/powerware/snmp/mode/batterystatus.pm b/hardware/ups/powerware/snmp/mode/batterystatus.pm index bdc3fa2d2..339e8e49b 100644 --- a/hardware/ups/powerware/snmp/mode/batterystatus.pm +++ b/hardware/ups/powerware/snmp/mode/batterystatus.pm @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'xupsBatCapacity' } ], output_template => 'remaining capacity: %s %%', perfdatas => [ - { value => 'xupsBatCapacity_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { value => 'xupsBatCapacity', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'xupsBatTimeRemaining' } ], output_template => 'remaining time: %s minutes', perfdatas => [ - { value => 'xupsBatTimeRemaining_absolute', template => '%s', min => 0, unit => 'm' }, + { value => 'xupsBatTimeRemaining', template => '%s', min => 0, unit => 'm' }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'xupsBatCurrent', no_value => 0 } ], output_template => 'current: %s A', perfdatas => [ - { value => 'xupsBatCurrent_absolute', template => '%s', unit => 'A' }, + { value => 'xupsBatCurrent', template => '%s', unit => 'A' }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'xupsBatVoltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { value => 'xupsBatVoltage_absolute', template => '%s', unit => 'V' }, + { value => 'xupsBatVoltage', template => '%s', unit => 'V' }, ], } }, diff --git a/hardware/ups/powerware/snmp/mode/environment.pm b/hardware/ups/powerware/snmp/mode/environment.pm index 5d71ec134..7c5b5d134 100644 --- a/hardware/ups/powerware/snmp/mode/environment.pm +++ b/hardware/ups/powerware/snmp/mode/environment.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'internal_temperature' } ], output_template => 'internal temperature: %.2f C', perfdatas => [ - { label => 'internal_temperature', value => 'internal_temperature_absolute', template => '%.2f', + { label => 'internal_temperature', value => 'internal_temperature', template => '%.2f', min => 0, unit => 'C' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'internal_humidity' } ], output_template => 'internal humidity: %.2f %%', perfdatas => [ - { label => 'internal_humidity', value => 'internal_humidity_absolute', template => '%.2f', + { label => 'internal_humidity', value => 'internal_humidity', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'remote_temperature' } ], output_template => 'remote temperature: %.2f C', perfdatas => [ - { label => 'remote_temperature', value => 'remote_temperature_absolute', template => '%.2f', + { label => 'remote_temperature', value => 'remote_temperature', template => '%.2f', min => 0, unit => 'C' }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'remote_humidity' } ], output_template => 'remote humidity: %.2f %%', perfdatas => [ - { label => 'remote_humidity', value => 'remote_humidity_absolute', template => '%.2f', + { label => 'remote_humidity', value => 'remote_humidity', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/hardware/ups/powerware/snmp/mode/inputlines.pm b/hardware/ups/powerware/snmp/mode/inputlines.pm index 4181739d9..711035d5c 100644 --- a/hardware/ups/powerware/snmp/mode/inputlines.pm +++ b/hardware/ups/powerware/snmp/mode/inputlines.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'xupsInputFrequency', no_value => 0 } ], output_template => 'frequence: %.2f Hz', perfdatas => [ - { value => 'xupsInputFrequency_absolute', template => '%.2f', + { value => 'xupsInputFrequency', template => '%.2f', unit => 'Hz' }, ], } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'xupsInputCurrent', no_value => 0 } ], output_template => 'current: %.2f A', perfdatas => [ - { value => 'xupsInputCurrent_absolute', template => '%.2f', + { value => 'xupsInputCurrent', template => '%.2f', min => 0, unit => 'A', label_extra_instance => 1 }, ], } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'xupsInputVoltage', no_value => 0 } ], output_template => 'voltage: %.2f V', perfdatas => [ - { value => 'xupsInputVoltage_absolute', template => '%.2f', + { value => 'xupsInputVoltage', template => '%.2f', unit => 'V', label_extra_instance => 1 }, ], } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'xupsInputWatts', no_value => 0 } ], output_template => 'power: %.2f W', perfdatas => [ - { value => 'xupsInputWatts_absolute', template => '%.2f', + { value => 'xupsInputWatts', template => '%.2f', unit => 'W', label_extra_instance => 1 }, ], } diff --git a/hardware/ups/powerware/snmp/mode/outputlines.pm b/hardware/ups/powerware/snmp/mode/outputlines.pm index 75fd73242..408aa93c8 100644 --- a/hardware/ups/powerware/snmp/mode/outputlines.pm +++ b/hardware/ups/powerware/snmp/mode/outputlines.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'xupsOutputLoad', no_value => -1 } ], output_template => 'Load : %.2f %%', perfdatas => [ - { value => 'xupsOutputLoad_absolute', template => '%.2f', + { value => 'xupsOutputLoad', template => '%.2f', min => 0, max => 100 }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'xupsOutputFrequency', no_value => 0 } ], output_template => 'Frequence : %.2f Hz', perfdatas => [ - { value => 'xupsOutputFrequency_absolute', template => '%.2f', + { value => 'xupsOutputFrequency', template => '%.2f', unit => 'Hz' }, ], } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'xupsOutputCurrent', no_value => 0 } ], output_template => 'Current : %.2f A', perfdatas => [ - { value => 'xupsOutputCurrent_absolute', template => '%.2f', + { value => 'xupsOutputCurrent', template => '%.2f', min => 0, unit => 'A', label_extra_instance => 1 }, ], } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'xupsOutputVoltage', no_value => 0 } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'xupsOutputVoltage_absolute', template => '%.2f', + { value => 'xupsOutputVoltage', template => '%.2f', unit => 'V', label_extra_instance => 1 }, ], } @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'xupsOutputWatts', no_value => 0 } ], output_template => 'Power: %.2f W', perfdatas => [ - { value => 'xupsOutputWatts_absolute', template => '%.2f', + { value => 'xupsOutputWatts', template => '%.2f', unit => 'W', label_extra_instance => 1 }, ], } diff --git a/hardware/ups/standard/rfc1628/snmp/mode/batterystatus.pm b/hardware/ups/standard/rfc1628/snmp/mode/batterystatus.pm index 50be23a72..5717b4f61 100644 --- a/hardware/ups/standard/rfc1628/snmp/mode/batterystatus.pm +++ b/hardware/ups/standard/rfc1628/snmp/mode/batterystatus.pm @@ -36,8 +36,8 @@ sub custom_load_output { my ($self, %options) = @_; return sprintf("charge remaining: %s%% (%s minutes remaining)", - $self->{result_values}->{charge_remain_absolute}, - $self->{result_values}->{minute_remain_absolute} + $self->{result_values}->{charge_remain}, + $self->{result_values}->{minute_remain} ); } @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'charge_remain' }, { name => 'minute_remain' } ], closure_custom_output => $self->can('custom_load_output'), perfdatas => [ - { label => 'load', value => 'charge_remain_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { label => 'load', value => 'charge_remain', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'minute_remain' } ], output_template => 'minutes remaining: %s', perfdatas => [ - { label => 'charge_remaining', value => 'minute_remain_absolute', template => '%s', min => 0, unit => 'minutes' }, + { label => 'charge_remaining', value => 'minute_remain', template => '%s', min => 0, unit => 'minutes' }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'current', no_value => 0 } ], output_template => 'current: %s A', perfdatas => [ - { label => 'current', value => 'current_absolute', template => '%s', min => 0, unit => 'A' }, + { label => 'current', value => 'current', template => '%s', min => 0, unit => 'A' }, ], } }, @@ -85,7 +85,7 @@ sub set_counters { key_values => [ { name => 'voltage', no_value => 0 } ], output_template => 'voltage: %s V', perfdatas => [ - { label => 'voltage', value => 'voltage_absolute', template => '%s', unit => 'V' }, + { label => 'voltage', value => 'voltage', template => '%s', unit => 'V' }, ], } }, @@ -93,7 +93,7 @@ sub set_counters { key_values => [ { name => 'temperature', no_value => 0 } ], output_template => 'temperature: %s C', perfdatas => [ - { label => 'temp', value => 'temperature_absolute', template => '%s', unit => 'C' }, + { label => 'temp', value => 'temperature', template => '%s', unit => 'C' }, ], } }, diff --git a/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm b/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm index 866062cff..d00a9b39b 100644 --- a/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm +++ b/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'upsInputFrequency' }, { name => 'display' } ], output_template => 'Frequence : %.2f Hz', perfdatas => [ - { label => 'frequence', value => 'upsInputFrequency_absolute', template => '%s', - unit => 'Hz', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'frequence', value => 'upsInputFrequency', template => '%s', + unit => 'Hz', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'upsInputVoltage' }, { name => 'display' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { label => 'voltage', value => 'upsInputVoltage_absolute', template => '%s', - unit => 'V', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'voltage', value => 'upsInputVoltage', template => '%s', + unit => 'V', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'upsInputCurrent' }, { name => 'display' } ], output_template => 'Current : %.2f A', perfdatas => [ - { label => 'current', value => 'upsInputCurrent_absolute', template => '%s', - unit => 'A', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current', value => 'upsInputCurrent', template => '%s', + unit => 'A', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -64,8 +64,8 @@ sub set_counters { key_values => [ { name => 'upsInputTruePower' }, { name => 'display' } ], output_template => 'Power : %.2f W', perfdatas => [ - { label => 'power', value => 'upsInputTruePower_absolute', template => '%s', - unit => 'W', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'power', value => 'upsInputTruePower', template => '%s', + unit => 'W', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/hardware/ups/standard/rfc1628/snmp/mode/outputlines.pm b/hardware/ups/standard/rfc1628/snmp/mode/outputlines.pm index 54f32bc9d..b56ade5fb 100644 --- a/hardware/ups/standard/rfc1628/snmp/mode/outputlines.pm +++ b/hardware/ups/standard/rfc1628/snmp/mode/outputlines.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'stdev' } ], output_template => 'Load Standard Deviation : %.2f', perfdatas => [ - { label => 'stdev', value => 'stdev_absolute', template => '%.2f' }, + { label => 'stdev', value => 'stdev', template => '%.2f' }, ], } }, @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'upsOutputPercentLoad' } ], output_template => 'Load : %.2f %%', perfdatas => [ - { value => 'upsOutputPercentLoad_absolute', template => '%.2f', + { value => 'upsOutputPercentLoad', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'upsOutputCurrent' } ], output_template => 'Current : %.2f A', perfdatas => [ - { value => 'upsOutputCurrent_absolute', template => '%.2f', + { value => 'upsOutputCurrent', template => '%.2f', min => 0, unit => 'A', label_extra_instance => 1 }, ], } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'upsOutputVoltage' } ], output_template => 'Voltage : %.2f V', perfdatas => [ - { value => 'upsOutputVoltage_absolute', template => '%.2f', + { value => 'upsOutputVoltage', template => '%.2f', unit => 'V', label_extra_instance => 1 }, ], } @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'upsOutputPower' } ], output_template => 'Power : %.2f W', perfdatas => [ - { value => 'upsOutputPower_absolute', template => '%.2f', + { value => 'upsOutputPower', template => '%.2f', unit => 'W', label_extra_instance => 1 }, ], } diff --git a/network/3com/snmp/mode/cpu.pm b/network/3com/snmp/mode/cpu.pm index 7e99a70f3..4c4f79b6a 100644 --- a/network/3com/snmp/mode/cpu.pm +++ b/network/3com/snmp/mode/cpu.pm @@ -36,8 +36,8 @@ sub set_counters { key_values => [ { name => 'usage_5s' }, { name => 'display' } ], output_template => '%s %% (5sec)', output_error_template => "%s (5sec)", perfdatas => [ - { label => 'cpu_5s', value => 'usage_5s_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_5s', value => 'usage_5s', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -45,8 +45,8 @@ sub set_counters { key_values => [ { name => 'usage_1m' }, { name => 'display' } ], output_template => '%s %% (1m)', output_error_template => "%s (1min)", perfdatas => [ - { label => 'cpu_1m', value => 'usage_1m_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_1m', value => 'usage_1m', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -54,8 +54,8 @@ sub set_counters { key_values => [ { name => 'usage_5m' }, { name => 'display' } ], output_template => '%s %% (5min)', output_error_template => "%s (5min)", perfdatas => [ - { label => 'cpu_5m', value => 'usage_5m_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_5m', value => 'usage_5m', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/a10/ax/snmp/mode/cpu.pm b/network/a10/ax/snmp/mode/cpu.pm index 5152ac668..8988dd7d1 100644 --- a/network/a10/ax/snmp/mode/cpu.pm +++ b/network/a10/ax/snmp/mode/cpu.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'cpu_30s' }, { name => 'display' } ], output_template => '30s : %s %%', perfdatas => [ - { label => 'cpu_30s', value => 'cpu_30s_absolute', template => '%s', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_30s', value => 'cpu_30s', template => '%s', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'cpu_1m' }, { name => 'display' } ], output_template => '1m : %s %%', perfdatas => [ - { label => 'cpu_1m', value => 'cpu_1m_absolute', template => '%s', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_1m', value => 'cpu_1m', template => '%s', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/a10/ax/snmp/mode/globalstats.pm b/network/a10/ax/snmp/mode/globalstats.pm index 1c0d77e7a..476f45d7d 100644 --- a/network/a10/ax/snmp/mode/globalstats.pm +++ b/network/a10/ax/snmp/mode/globalstats.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'current_connections' } ], output_template => 'Current Connections : %s', perfdatas => [ - { label => 'current_connections', value => 'current_connections_absolute', template => '%s', + { label => 'current_connections', value => 'current_connections', template => '%s', min => 0 }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'total_connections', diff => 1 } ], output_template => 'Total Connections : %s', perfdatas => [ - { label => 'total_connections', value => 'total_connections_absolute', template => '%s', + { label => 'total_connections', value => 'total_connections', template => '%s', min => 0 }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'total_ssl_connections', diff => 1 } ], output_template => 'Total SSL Connections : %s', perfdatas => [ - { label => 'total_ssl_connections', value => 'total_ssl_connections_absolute', template => '%s', + { label => 'total_ssl_connections', value => 'total_ssl_connections', template => '%s', min => 0 }, ], } diff --git a/network/a10/ax/snmp/mode/vserverusage.pm b/network/a10/ax/snmp/mode/vserverusage.pm index 00e13b3eb..ed57ea02c 100644 --- a/network/a10/ax/snmp/mode/vserverusage.pm +++ b/network/a10/ax/snmp/mode/vserverusage.pm @@ -62,8 +62,8 @@ sub set_counters { key_values => [ { name => 'axVirtualServerStatCurConns' }, { name => 'display' } ], output_template => 'Current Connections : %s', perfdatas => [ - { label => 'current_connections', value => 'axVirtualServerStatCurConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -71,28 +71,28 @@ sub set_counters { key_values => [ { name => 'axVirtualServerStatTotConns', diff => 1 }, { name => 'display' } ], output_template => 'Total Connections : %s', perfdatas => [ - { label => 'total_connections', value => 'axVirtualServerStatTotConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', nlabel => 'virtualserver.traffic.in.bitspersecond', set => { - key_values => [ { name => 'axVirtualServerStatBytesIn', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'axVirtualServerStatBytesIn', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'axVirtualServerStatBytesIn_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', nlabel => 'virtualserver.traffic.out.bitspersecond', set => { - key_values => [ { name => 'axVirtualServerStatBytesOut', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'axVirtualServerStatBytesOut', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'axVirtualServerStatBytesOut_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -110,13 +110,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} =~ /down/i' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} =~ /down/i' } + }); + return $self; } diff --git a/network/acmepacket/snmp/mode/realmusage.pm b/network/acmepacket/snmp/mode/realmusage.pm index f01a8b63b..de1cef17c 100644 --- a/network/acmepacket/snmp/mode/realmusage.pm +++ b/network/acmepacket/snmp/mode/realmusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsCurrentActiveSessionsInbound' }, { name => 'display' } ], output_template => 'Current Inbound Sessions : %s', perfdatas => [ - { label => 'current_inbound_sessions', value => 'apSigRealmStatsCurrentActiveSessionsInbound_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_inbound_sessions', value => 'apSigRealmStatsCurrentActiveSessionsInbound', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsCurrentSessionRateInbound' }, { name => 'display' } ], output_template => 'Current Inbound Sessions Rate : %s/s', perfdatas => [ - { label => 'current_inbound_sessions_rate', value => 'apSigRealmStatsCurrentSessionRateInbound_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_inbound_sessions_rate', value => 'apSigRealmStatsCurrentSessionRateInbound', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsTotalSessionsInbound', diff => 1 }, { name => 'display' } ], output_template => 'Total Inbound Sessions : %s', perfdatas => [ - { label => 'total_inbound_sessions', value => 'apSigRealmStatsTotalSessionsInbound_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_inbound_sessions', value => 'apSigRealmStatsTotalSessionsInbound', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsCurrentActiveSessionsOutbound' }, { name => 'display' } ], output_template => 'Current Outbound Sessions : %s', perfdatas => [ - { label => 'current_outbound_sessions', value => 'apSigRealmStatsCurrentActiveSessionsOutbound_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_outbound_sessions', value => 'apSigRealmStatsCurrentActiveSessionsOutbound', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsCurrentSessionRateOutbound' }, { name => 'display' } ], output_template => 'Current Outbound Sessions Rate : %s/s', perfdatas => [ - { label => 'current_outbound_sessions_rate', value => 'apSigRealmStatsCurrentSessionRateOutbound_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_outbound_sessions_rate', value => 'apSigRealmStatsCurrentSessionRateOutbound', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsTotalSessionsOutbound', diff => 1 }, { name => 'display' } ], output_template => 'Total Outbound Sessions : %s', perfdatas => [ - { label => 'total_outbound_sessions', value => 'apSigRealmStatsTotalSessionsOutbound_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_outbound_sessions', value => 'apSigRealmStatsTotalSessionsOutbound', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsAverageQoSRFactor' }, { name => 'display' } ], output_template => 'Average QoS RFactor : %s', perfdatas => [ - { label => 'avg_qos_rfactor', value => 'apSigRealmStatsAverageQoSRFactor_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_qos_rfactor', value => 'apSigRealmStatsAverageQoSRFactor', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -101,8 +101,8 @@ sub set_counters { key_values => [ { name => 'apSigRealmStatsTotalMajorRFactorExceeded', diff => 1 }, { name => 'display' } ], output_template => 'Total Rfactor Exceeded : %s', perfdatas => [ - { label => 'total_rfactor', value => 'apSigRealmStatsTotalMajorRFactorExceeded_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_rfactor', value => 'apSigRealmStatsTotalMajorRFactorExceeded', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/acmepacket/snmp/mode/sipusage.pm b/network/acmepacket/snmp/mode/sipusage.pm index af674f1ca..65a5d2cd1 100644 --- a/network/acmepacket/snmp/mode/sipusage.pm +++ b/network/acmepacket/snmp/mode/sipusage.pm @@ -58,22 +58,20 @@ sub set_counters { } }, { label => 'in-sessions-rate', nlabel => 'sip.sessions.in.rate', set => { - key_values => [ { name => 'apSipSAStatsTotalSessionsInbound', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'apSipSAStatsTotalSessionsInbound', per_second => 1 }, { name => 'display' } ], output_template => 'Inbound Sessions Rate : %.2f/s', - per_second => 1, perfdatas => [ - { label => 'inbound_sessions_rate', value => 'apSipSAStatsTotalSessionsInbound_per_second', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'inbound_sessions_rate', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'out-sessions-rate', nlabel => 'sip.sessions.out.rate', set => { - key_values => [ { name => 'apSipSAStatsTotalSessionsOutbound', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'apSipSAStatsTotalSessionsOutbound', per_second => 1 }, { name => 'display' } ], output_template => 'Outbound Sessions Rate : %.2f/s', - per_second => 1, perfdatas => [ - { label => 'outbound_sessions_rate', value => 'apSipSAStatsTotalSessionsOutbound_per_second', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'outbound_sessions_rate', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -81,8 +79,8 @@ sub set_counters { key_values => [ { name => 'apSipSAStatsAverageLatency' }, { name => 'display' } ], output_template => 'Average Latency : %s ms', perfdatas => [ - { label => 'avg_latency', value => 'apSipSAStatsAverageLatency_absolute', template => '%s', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_latency', template => '%s', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -90,8 +88,8 @@ sub set_counters { key_values => [ { name => 'apSipSAStatsPeriodASR' }, { name => 'display' } ], output_template => 'Answer-to-seizure Ratio : %s %%', perfdatas => [ - { label => 'asr', value => 'apSipSAStatsPeriodASR_absolute', template => '%s', - unit => '%', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'asr', template => '%s', + unit => '%', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -109,13 +107,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} =~ /outOfService|constraintsViolation|inServiceTimedOut/i' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} =~ /outOfService|constraintsViolation|inServiceTimedOut/i' } + }); + return $self; } diff --git a/network/acmepacket/snmp/mode/systemusage.pm b/network/acmepacket/snmp/mode/systemusage.pm index 6a98e117a..5249c62f5 100644 --- a/network/acmepacket/snmp/mode/systemusage.pm +++ b/network/acmepacket/snmp/mode/systemusage.pm @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'health_score' } ], output_template => 'Health Score : %.2f %%', perfdatas => [ - { label => 'health_score', value => 'health_score_absolute', template => '%.2f', + { label => 'health_score', value => 'health_score', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'cpu_load' } ], output_template => 'Cpu Load : %.2f %%', perfdatas => [ - { label => 'cpu_load', value => 'cpu_load_absolute', template => '%.2f', + { label => 'cpu_load', value => 'cpu_load', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'memory_used' } ], output_template => 'Memory Used : %.2f %%', perfdatas => [ - { label => 'memory_used', value => 'memory_used_absolute', template => '%.2f', + { label => 'memory_used', value => 'memory_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'license_used' } ], output_template => 'License Used : %.2f %%', perfdatas => [ - { label => 'license_used', value => 'license_used_absolute', template => '%.2f', + { label => 'license_used', value => 'license_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -88,7 +88,7 @@ sub set_counters { key_values => [ { name => 'current_sessions' } ], output_template => 'Current Sessions : %s', perfdatas => [ - { label => 'current_sessions', value => 'current_sessions_absolute', template => '%s', + { label => 'current_sessions', value => 'current_sessions', template => '%s', min => 0 }, ], } @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => 'current_calls' } ], output_template => 'Current Calls : %s/s', perfdatas => [ - { label => 'current_calls', value => 'current_calls_absolute', template => '%s', + { label => 'current_calls', value => 'current_calls', template => '%s', unit => '/s', min => 0 }, ], } diff --git a/network/adva/fsp150/snmp/mode/systems.pm b/network/adva/fsp150/snmp/mode/systems.pm index d4a345c5e..69eaecf34 100644 --- a/network/adva/fsp150/snmp/mode/systems.pm +++ b/network/adva/fsp150/snmp/mode/systems.pm @@ -52,11 +52,11 @@ sub set_counters { nlabel => $self->{nlabel}, unit => '%', instances => [ - $self->{result_values}->{ne_name_absolute}, - $self->{result_values}->{shelf_name_absolute}, - $self->{result_values}->{slot_name_absolute} + $self->{result_values}->{ne_name}, + $self->{result_values}->{shelf_name}, + $self->{result_values}->{slot_name} ], - value => sprintf('%.2f', $self->{result_values}->{cpu_average_absolute}), + value => sprintf('%.2f', $self->{result_values}->{cpu_average}), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0, max => 100 @@ -78,11 +78,11 @@ sub set_counters { nlabel => $self->{nlabel}, unit => 'B', instances => [ - $self->{result_values}->{ne_name_absolute}, - $self->{result_values}->{shelf_name_absolute}, - $self->{result_values}->{slot_name_absolute} + $self->{result_values}->{ne_name}, + $self->{result_values}->{shelf_name}, + $self->{result_values}->{slot_name} ], - value => $self->{result_values}->{memory_used_absolute}, + value => $self->{result_values}->{memory_used}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 diff --git a/network/adva/fsp3000/snmp/mode/interfaces.pm b/network/adva/fsp3000/snmp/mode/interfaces.pm index c5d33d00f..a1e8f9ca6 100644 --- a/network/adva/fsp3000/snmp/mode/interfaces.pm +++ b/network/adva/fsp3000/snmp/mode/interfaces.pm @@ -42,22 +42,20 @@ sub set_counters_traffic { push @{$self->{maps_counters}->{int}}, { label => 'traffic-in', filter => 'add_traffic', nlabel => 'interface.traffic.in.bitspersecond', set => { key_values => [ { name => 'traffic_in_15min', diff => 1 }, { name => 'traffic_in_1day', diff => 1 }, { name => 'speed_in'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic In : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), - closure_custom_threshold_check => $self->can('custom_traffic_threshold'), + closure_custom_threshold_check => $self->can('custom_traffic_threshold') } }, { label => 'traffic-out', filter => 'add_traffic', nlabel => 'interface.traffic.out.bitspersecond', set => { key_values => [ { name => 'traffic_out_15min', diff => 1 }, { name => 'traffic_out_1day', diff => 1 }, { name => 'speed_out'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic Out : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), - closure_custom_threshold_check => $self->can('custom_traffic_threshold'), + closure_custom_threshold_check => $self->can('custom_traffic_threshold') } - }, + } ; } @@ -71,8 +69,8 @@ sub set_counters { key_values => [ { name => 'laser_temp' }, { name => 'display' } ], output_template => 'Laser Temperature : %.2f C', output_error_template => 'Laser Temperature : %.2f', perfdatas => [ - { label => 'laser_temp', value => 'laser_temp_absolute', template => '%.2f', - unit => 'C', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'laser_temp', template => '%.2f', + unit => 'C', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -80,8 +78,8 @@ sub set_counters { key_values => [ { name => 'input_power' }, { name => 'display' } ], output_template => 'Input Power : %s dBm', output_error_template => 'Input Power : %s', perfdatas => [ - { label => 'input_power', value => 'input_power_absolute', template => '%s', - unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'input_power', template => '%s', + unit => 'dBm', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -89,8 +87,8 @@ sub set_counters { key_values => [ { name => 'output_power' }, { name => 'display' } ], output_template => 'Output Power : %s dBm', output_error_template => 'Output Power : %s', perfdatas => [ - { label => 'output_power', value => 'output_power_absolute', template => '%s', - unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'output_power', template => '%s', + unit => 'dBm', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/aerohive/snmp/mode/connectedusers.pm b/network/aerohive/snmp/mode/connectedusers.pm index 9d08a517e..04dc84c50 100644 --- a/network/aerohive/snmp/mode/connectedusers.pm +++ b/network/aerohive/snmp/mode/connectedusers.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Users : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', unit => 'users', min => 0 }, ], } @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'display' } ], output_template => 'users : %s', perfdatas => [ - { label => 'ssid', value => 'total_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ssid', value => 'total', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/alcatel/isam/snmp/mode/cpu.pm b/network/alcatel/isam/snmp/mode/cpu.pm index c2ff800c1..6fbdea86d 100644 --- a/network/alcatel/isam/snmp/mode/cpu.pm +++ b/network/alcatel/isam/snmp/mode/cpu.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'usage' }, { name => 'display' }, ], output_template => 'Usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'usage_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'usage', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/alcatel/isam/snmp/mode/hubsapusage.pm b/network/alcatel/isam/snmp/mode/hubsapusage.pm index 4524380d1..614d1e6cf 100644 --- a/network/alcatel/isam/snmp/mode/hubsapusage.pm +++ b/network/alcatel/isam/snmp/mode/hubsapusage.pm @@ -42,25 +42,23 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => $self->can('custom_status_threshold'), + closure_custom_threshold_check => $self->can('custom_status_threshold') } }, { label => 'in-traffic', nlabel => 'sap.traffic.in.bitspersecond', set => { key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_sap_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_sap_output'), closure_custom_perfdata => $self->can('custom_sap_perfdata'), - closure_custom_threshold_check => $self->can('custom_qsap_threshold'), + closure_custom_threshold_check => $self->can('custom_qsap_threshold') } }, { label => 'out-traffic', nlabel => 'sap.traffic.out.bitspersecond', set => { key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_sap_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_sap_output'), closure_custom_perfdata => $self->can('custom_sap_perfdata'), - closure_custom_threshold_check => $self->can('custom_sap_threshold'), + closure_custom_threshold_check => $self->can('custom_sap_threshold') } }, ]; @@ -68,20 +66,20 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'total-in-traffic', nlabel => 'sap.traffic.in.bitspersecond', set => { key_values => [], - manual_keys => 1, per_second => 1, output_change_bytes => 2, + manual_keys => 1, closure_custom_calc => $self->can('custom_total_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_total_traffic_output'), closure_custom_perfdata => $self->can('custom_total_traffic_perfdata'), - closure_custom_threshold_check => $self->can('custom_total_traffic_threshold'), + closure_custom_threshold_check => $self->can('custom_total_traffic_threshold') } }, { label => 'total-out-traffic', nlabel => 'sap.traffic.out.bitspersecond', set => { key_values => [], - manual_keys => 1, per_second => 1, output_change_bytes => 2, + manual_keys => 1, closure_custom_calc => $self->can('custom_total_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_total_traffic_output'), closure_custom_perfdata => $self->can('custom_total_traffic_perfdata'), - closure_custom_threshold_check => $self->can('custom_total_traffic_threshold'), + closure_custom_threshold_check => $self->can('custom_total_traffic_threshold') } }, ]; @@ -283,16 +281,16 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "reload-cache-time:s" => { name => 'reload_cache_time', default => 300 }, - "display-name:s" => { name => 'display_name', default => '%{SvcDescription}.%{IfName}.%{SapEncapName}' }, - "filter-name:s" => { name => 'filter_name' }, - "speed-in:s" => { name => 'speed_in' }, - "speed-out:s" => { name => 'speed_out' }, - "speed-total-in:s" => { name => 'speed_total_in' }, - "speed-total-out:s" => { name => 'speed_total_out' }, - "units-traffic:s" => { name => 'units_traffic', default => '%' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{admin} =~ /up/i and %{status} !~ /up/i' }, + 'reload-cache-time:s' => { name => 'reload_cache_time', default => 300 }, + 'display-name:s' => { name => 'display_name', default => '%{SvcDescription}.%{IfName}.%{SapEncapName}' }, + 'filter-name:s' => { name => 'filter_name' }, + 'speed-in:s' => { name => 'speed_in' }, + 'speed-out:s' => { name => 'speed_out' }, + 'speed-total-in:s' => { name => 'speed_total_in' }, + 'speed-total-out:s' => { name => 'speed_total_out' }, + 'units-traffic:s' => { name => 'units_traffic', default => '%' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{admin} =~ /up/i and %{status} !~ /up/i' }, }); $self->{statefile_cache} = centreon::plugins::statefile->new(%options); diff --git a/network/alcatel/pss/1830/snmp/mode/sapqosstats.pm b/network/alcatel/pss/1830/snmp/mode/sapqosstats.pm index f69f9135b..6e492b3fc 100644 --- a/network/alcatel/pss/1830/snmp/mode/sapqosstats.pm +++ b/network/alcatel/pss/1830/snmp/mode/sapqosstats.pm @@ -41,46 +41,42 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'traffic-in-below-cir', set => { - key_values => [ { name => 'tnSapBaseStatsIngressQchipForwardedInProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'tnSapBaseStatsIngressQchipForwardedInProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In Below CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in_below_cir', value => 'tnSapBaseStatsIngressQchipForwardedInProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_below_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in-above-cir', set => { - key_values => [ { name => 'tnSapBaseStatsIngressQchipForwardedOutProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'tnSapBaseStatsIngressQchipForwardedOutProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In Above CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in_above_cir', value => 'tnSapBaseStatsIngressQchipForwardedOutProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_above_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out-below-cir', set => { - key_values => [ { name => 'tnSapBaseStatsEgressQchipForwardedInProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'tnSapBaseStatsEgressQchipForwardedInProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out Below CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out_below_cir', value => 'tnSapBaseStatsEgressQchipForwardedInProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_below_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out-above-cir', set => { - key_values => [ { name => 'tnSapBaseStatsEgressQchipForwardedOutProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'tnSapBaseStatsEgressQchipForwardedOutProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out Above CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out_above_cir', value => 'tnSapBaseStatsEgressQchipForwardedOutProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_above_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -108,15 +104,14 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "reload-cache-time:s" => { name => 'reload_cache_time', default => 300 }, - "display-name:s" => { name => 'display_name', default => '%{SysSwitchId}.%{SvcId}.%{SapPortId}.%{SapEncapValue}' }, - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{admin} =~ /up/i and %{status} !~ /up/i' }, - }); - + $options{options}->add_options(arguments => { + 'reload-cache-time:s' => { name => 'reload_cache_time', default => 300 }, + 'display-name:s' => { name => 'display_name', default => '%{SysSwitchId}.%{SvcId}.%{SapPortId}.%{SapEncapValue}' }, + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{admin} =~ /up/i and %{status} !~ /up/i' } + }); + $self->{statefile_cache} = centreon::plugins::statefile->new(%options); return $self; } diff --git a/network/allied/snmp/mode/cpu.pm b/network/allied/snmp/mode/cpu.pm index b3078d390..b8ae1fb73 100644 --- a/network/allied/snmp/mode/cpu.pm +++ b/network/allied/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'average_1m' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { value => 'average_1m_absolute', template => '%.2f', + { value => 'average_1m', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'average_5m' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { value => 'average_5m_absolute', template => '%.2f', + { value => 'average_5m', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/allied/snmp/mode/memory.pm b/network/allied/snmp/mode/memory.pm index 91bc2989b..0e33e34ef 100644 --- a/network/allied/snmp/mode/memory.pm +++ b/network/allied/snmp/mode/memory.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'used_prct' } ], output_template => 'memory used: %.2f %%', perfdatas => [ - { value => 'used_prct_absolute', template => '%.2f', + { value => 'used_prct', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/alvarion/breezeaccess/snmp/mode/radiostatus.pm b/network/alvarion/breezeaccess/snmp/mode/radiostatus.pm index af225d0ca..114ed7c79 100644 --- a/network/alvarion/breezeaccess/snmp/mode/radiostatus.pm +++ b/network/alvarion/breezeaccess/snmp/mode/radiostatus.pm @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'rx_snr' } ], output_template => 'Average signal to noise ratio: %s Dbm', perfdatas => [ - { label => 'rx_snr', value => 'rx_snr_absolute', template => '%s', min => 0 , unit => 'Dbm' }, + { label => 'rx_snr', value => 'rx_snr', template => '%s', min => 0 , unit => 'Dbm' }, ], } }, @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'rx_power' } ], output_template => 'Received signal strength: %s Dbm', perfdatas => [ - { label => 'rx_power', value => 'rx_power_absolute', template => '%s', min => 0 , unit => 'Dbm' }, + { label => 'rx_power', value => 'rx_power', template => '%s', min => 0 , unit => 'Dbm' }, ], } }, diff --git a/network/arista/snmp/mode/memory.pm b/network/arista/snmp/mode/memory.pm index 9d8b90d59..13071a73c 100644 --- a/network/arista/snmp/mode/memory.pm +++ b/network/arista/snmp/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_usage_output { return sprintf( 'Ram Total: %s %s Used (-buffers/cache): %s %s (%.2f%%) Free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Ram Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' } ] } @@ -78,7 +78,7 @@ sub set_counters { output_template => 'Buffer: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'buffer_absolute', template => '%d', + { value => 'buffer', template => '%d', min => 0, unit => 'B' } ] } @@ -88,7 +88,7 @@ sub set_counters { output_template => 'Cached: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'cached_absolute', template => '%d', + { value => 'cached', template => '%d', min => 0, unit => 'B' } ] } diff --git a/network/aruba/instant/snmp/mode/apusage.pm b/network/aruba/instant/snmp/mode/apusage.pm index 11f976a00..2989321c9 100644 --- a/network/aruba/instant/snmp/mode/apusage.pm +++ b/network/aruba/instant/snmp/mode/apusage.pm @@ -37,11 +37,11 @@ sub custom_memory_output { my ($self, %options) = @_; my $msg = sprintf("Memory Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute}); + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free}); return $msg; } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total access points: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 }, + { value => 'total', template => '%s', min => 0 }, ], } }, @@ -78,8 +78,8 @@ sub set_counters { key_values => [ { name => 'clients' }, { name => 'display' } ], output_template => 'Current Clients: %s', perfdatas => [ - { label => 'clients', value => 'clients_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'clients', value => 'clients', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -87,8 +87,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'display' } ], output_template => 'Cpu: %.2f%%', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'cpu', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -97,8 +97,8 @@ sub set_counters { { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_memory_output'), perfdatas => [ - { label => 'mem_used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'mem_used', value => 'used', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -107,8 +107,8 @@ sub set_counters { { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_memory_output'), perfdatas => [ - { label => 'mem_free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'mem_free', value => 'free', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -116,8 +116,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Memory Used: %.2f %%', perfdatas => [ - { label => 'mem_used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'mem_used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/atrica/snmp/mode/connections.pm b/network/atrica/snmp/mode/connections.pm index 01976643c..bc7f2c6f6 100644 --- a/network/atrica/snmp/mode/connections.pm +++ b/network/atrica/snmp/mode/connections.pm @@ -148,7 +148,6 @@ sub set_counters_traffic { push @{$self->{maps_counters}->{int}}, { label => 'in-cir', filter => 'add_traffic', nlabel => 'interface.traffic.in.cir.bitspersecond', set => { key_values => [ { name => 'in_cir', diff => 1 }, { name => 'speed_in'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in_cir' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic In CIR : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -157,7 +156,6 @@ sub set_counters_traffic { }, { label => 'in-eir', filter => 'add_traffic', nlabel => 'interface.traffic.in.eir.bitspersecond', set => { key_values => [ { name => 'in_eir', diff => 1 }, { name => 'speed_in'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in_eir' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic In EIR : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -166,7 +164,6 @@ sub set_counters_traffic { }, { label => 'out-cir', filter => 'add_traffic', nlabel => 'interface.traffic.out.cir.bitspersecond', set => { key_values => [ { name => 'out_cir', diff => 1 }, { name => 'speed_out'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out_cir' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic Out CIR : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -175,13 +172,12 @@ sub set_counters_traffic { }, { label => 'out-eir', filter => 'add_traffic', nlabel => 'interface.traffic.out.eir.bitspersecond', set => { key_values => [ { name => 'out_eir', diff => 1 }, { name => 'speed_out'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out_eir' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic Out EIR : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), closure_custom_threshold_check => $self->can('custom_traffic_threshold'), } - }, + } ; } @@ -191,7 +187,6 @@ sub set_counters_errors { push @{$self->{maps_counters}->{int}}, { label => 'in-eir-discard', filter => 'add_errors', nlabel => 'interface.packets.in.eir.discard.count', set => { key_values => [ { name => 'in_eir_discard', diff => 1 }, { name => 'speed_in'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in_eir_discard' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic In EIR Discard : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -200,13 +195,12 @@ sub set_counters_errors { }, { label => 'out-eir-discard', filter => 'add_errors', nlabel => 'interface.packets.out.eir.discard.count', set => { key_values => [ { name => 'out_eir_discard', diff => 1 }, { name => 'speed_out'}, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out_eir_discard' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic Out EIR Discard : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), closure_custom_threshold_check => $self->can('custom_traffic_threshold'), } - }, + } ; } diff --git a/network/atto/fibrebridge/snmp/mode/fcportusage.pm b/network/atto/fibrebridge/snmp/mode/fcportusage.pm index 8f6df5378..a58d39891 100644 --- a/network/atto/fibrebridge/snmp/mode/fcportusage.pm +++ b/network/atto/fibrebridge/snmp/mode/fcportusage.pm @@ -57,26 +57,24 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'traffic-in', nlabel => 'fc.port.traffic.in.wordspersecond', set => { - key_values => [ { name => 'fcStatsRxWords', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'fcStatsRxWords', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in : %.2f words/s', perfdatas => [ - { label => 'traffic_in', template => '%.2f', value => 'fcStatsRxWords_per_second', - unit => 'words/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + unit => 'words/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', nlabel => 'fc.port.traffic.out.wordspersecond', set => { - key_values => [ { name => 'fcStatsTxWords', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'fcStatsTxWords', per_second => 1 }, { name => 'display' } ], output_template => 'traffic out : %.2f words/s', perfdatas => [ - { label => 'traffic_out', template => '%.2f', value => 'fcStatsTxWords_per_second', - unit => 'words/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + unit => 'words/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -84,8 +82,7 @@ sub set_counters { key_values => [ { name => 'fcStatsErrInvalidCRC', diff => 1 }, { name => 'display' } ], output_template => 'number of invalid CRC : %s', perfdatas => [ - { label => 'invalid_crc', value => 'fcStatsErrInvalidCRC_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'invalid_crc', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -93,11 +90,10 @@ sub set_counters { key_values => [ { name => 'fcStatsErrSignalLoss', diff => 1 }, { name => 'display' } ], output_template => 'number of signal loss : %s', perfdatas => [ - { label => 'signal_loss', value => 'fcStatsErrSignalLoss_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'signal_loss', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, + ] } - }, + } ]; } @@ -113,9 +109,9 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{admin} =~ /enabled/ and %{status} !~ /online/' }, + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{admin} =~ /enabled/ and %{status} !~ /online/' } }); return $self; diff --git a/network/audiocodes/snmp/mode/cpu.pm b/network/audiocodes/snmp/mode/cpu.pm index 1b8413dc7..06590819c 100644 --- a/network/audiocodes/snmp/mode/cpu.pm +++ b/network/audiocodes/snmp/mode/cpu.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'voip' } ], output_template => 'CPU VoIp Usage : %.2f %%', perfdatas => [ - { label => 'cpu_voip', value => 'voip_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'cpu_voip', value => 'voip', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'data' } ], output_template => 'CPU Data Usage : %.2f %%', perfdatas => [ - { label => 'cpu_data', value => 'data_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'cpu_data', value => 'data', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/network/audiocodes/snmp/mode/memory.pm b/network/audiocodes/snmp/mode/memory.pm index 92c6d5e1b..7a92c5b19 100644 --- a/network/audiocodes/snmp/mode/memory.pm +++ b/network/audiocodes/snmp/mode/memory.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'voip' } ], output_template => 'Memory VoIp Usage : %.2f %%', perfdatas => [ - { label => 'used_voip', value => 'voip_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'used_voip', value => 'voip', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'data' } ], output_template => 'Memory Data Usage : %.2f %%', perfdatas => [ - { label => 'used_data', value => 'data_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'used_data', value => 'data', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/network/audiocodes/snmp/mode/trunkstatus.pm b/network/audiocodes/snmp/mode/trunkstatus.pm index c718c450b..dafc5e028 100644 --- a/network/audiocodes/snmp/mode/trunkstatus.pm +++ b/network/audiocodes/snmp/mode/trunkstatus.pm @@ -64,8 +64,8 @@ sub set_counters { key_values => [ { name => 'acPMTrunkUtilizationAverage' }, { name => 'display' } ], output_template => 'Average calls : %s', perfdatas => [ - { label => 'avg_calls', value => 'acPMTrunkUtilizationAverage_absolute', template => '%d', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'avg_calls', value => 'acPMTrunkUtilizationAverage', template => '%d', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -73,8 +73,8 @@ sub set_counters { key_values => [ { name => 'acPMTrunkUtilizationMax' }, { name => 'display' } ], output_template => 'Max calls : %s', perfdatas => [ - { label => 'max_calls', value => 'acPMTrunkUtilizationMax_absolute', template => '%d', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'max_calls', value => 'acPMTrunkUtilizationMax', template => '%d', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'acPMTrunkUtilizationTotal', diff => 1 }, { name => 'display' } ], output_template => 'Count calls : %s', perfdatas => [ - { label => 'count_calls', value => 'acPMTrunkUtilizationTotal_absolute', template => '%d', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'count_calls', value => 'acPMTrunkUtilizationTotal', template => '%d', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/beeware/snmp/mode/reverseproxyusage.pm b/network/beeware/snmp/mode/reverseproxyusage.pm index d821eda5c..b929991e2 100644 --- a/network/beeware/snmp/mode/reverseproxyusage.pm +++ b/network/beeware/snmp/mode/reverseproxyusage.pm @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'display' } ], output_template => 'CPU Usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'cpu', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -71,8 +71,8 @@ sub set_counters { output_template => 'Memory Usage : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'memory', value => 'memory_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'memory', value => 'memory', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -80,8 +80,8 @@ sub set_counters { key_values => [ { name => 'nbchilds' }, { name => 'display' } ], output_template => 'Num childs : %s', perfdatas => [ - { label => 'nbchilds', value => 'nbchilds_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'nbchilds', value => 'nbchilds', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/checkpoint/snmp/mode/memory.pm b/network/checkpoint/snmp/mode/memory.pm index 67203270f..9588136fa 100644 --- a/network/checkpoint/snmp/mode/memory.pm +++ b/network/checkpoint/snmp/mode/memory.pm @@ -29,15 +29,15 @@ use Digest::MD5 qw(md5_hex); sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); return sprintf( 'Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_absolute}, - $total_free_value . " " . $total_free_unit, 100 - $self->{result_values}->{prct_used_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used}, + $total_free_value . " " . $total_free_unit, 100 - $self->{result_values}->{prct_used} ); } @@ -54,10 +54,10 @@ sub set_counters { { label => 'memory', set => { key_values => [ { name => 'prct_used'}, { name => 'used' }, { name => 'free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), - threshold_use => 'prct_used_absolute', + threshold_use => 'prct_used', perfdatas => [ - { label => 'memory', value => 'used_absolute', template => '%.2f', threshold_total => 'total_absolute', cast_int => 1, - min => 0, max => 'total_absolute', unit => 'B' }, + { label => 'memory', value => 'used', template => '%.2f', threshold_total => 'total', cast_int => 1, + min => 0, max => 'total', unit => 'B' }, ], } }, @@ -67,10 +67,10 @@ sub set_counters { { label => 'swap', set => { key_values => [ { name => 'prct_used' }, { name => 'used' }, { name => 'free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), - threshold_use => 'prct_used_absolute', + threshold_use => 'prct_used', perfdatas => [ - { label => 'swap', value => 'used_absolute', template => '%.2f', threshold_total => 'total_absolute', cast_int => 1, - min => 0, max => 'total_absolute', unit => 'B' }, + { label => 'swap', value => 'used', template => '%.2f', threshold_total => 'total', cast_int => 1, + min => 0, max => 'total', unit => 'B' }, ], } }, @@ -78,14 +78,13 @@ sub set_counters { $self->{maps_counters}->{malloc} = [ { label => 'failed-malloc', set => { - key_values => [ { name => 'failed_mallocs', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'failed_mallocs', per_second => 1 } ], output_template => 'Failed memory allocations %.2f/s', perfdatas => [ - { label => 'failed_mallocs', value => 'failed_mallocs_per_second', template => '%.2f', min => 0 }, - ], + { label => 'failed_mallocs', template => '%.2f', min => 0 } + ] } - }, + } ]; } diff --git a/network/checkpoint/snmp/mode/vpnstatus.pm b/network/checkpoint/snmp/mode/vpnstatus.pm index 08c42fa21..048b789ca 100644 --- a/network/checkpoint/snmp/mode/vpnstatus.pm +++ b/network/checkpoint/snmp/mode/vpnstatus.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'current total number of tunnels: %d', perfdatas => [ - { value => 'total_absolute', template => '%d', min => 0 } + { value => 'total', template => '%d', min => 0 } ] } } diff --git a/network/checkpoint/snmp/mode/vsx.pm b/network/checkpoint/snmp/mode/vsx.pm index 5418e8e5e..27c8ba1fe 100644 --- a/network/checkpoint/snmp/mode/vsx.pm +++ b/network/checkpoint/snmp/mode/vsx.pm @@ -65,8 +65,7 @@ sub set_counters { key_values => [ { name => 'cpu_1hour' }, { name => 'display' } ], output_template => '%.2f%% (1hour)', perfdatas => [ - { value => 'cpu_1hour_absolute', template => '%.2f', unit => '%', min => 0, max => 100, - label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -74,8 +73,7 @@ sub set_counters { key_values => [ { name => 'cpu_1min' }, { name => 'display' } ], output_template => '%.2f%% (1min)', perfdatas => [ - { value => 'cpu_1min_absolute', template => '%.2f', unit => '%', min => 0, max => 100, - label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -87,8 +85,7 @@ sub set_counters { output_template => 'memory used: %s%s', output_change_bytes => 1, perfdatas => [ - { value => 'memory_used_absolute', template => '%s', min => 0, - unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' } ] } } @@ -99,8 +96,7 @@ sub set_counters { key_values => [ { name => 'active_connections' }, { name => 'display' } ], output_template => 'active connections: %d', perfdatas => [ - { value => 'active_connections_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -108,32 +104,29 @@ sub set_counters { $self->{maps_counters}->{vsx_traffic} = [ { label => 'traffic-accepted', nlabel => 'virtualsystem.traffic.accepted.bitspersecond', set => { - key_values => [ { name => 'traffic_accepted', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_accepted', per_second => 1 }, { name => 'display' } ], output_template => 'traffic accepted: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_accepted_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-dropped', nlabel => 'virtualsystem.traffic.dropped.bitspersecond', set => { - key_values => [ { name => 'traffic_dropped', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_dropped', per_second => 1 }, { name => 'display' } ], output_template => 'traffic dropped: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_dropped_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-rejected', nlabel => 'virtualsystem.traffic.rejected.bitspersecond', set => { - key_values => [ { name => 'traffic_rejected', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_rejected', per_second => 1 }, { name => 'display' } ], output_template => 'traffic rejected: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_rejected_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/network/cisco/aci/apic/restapi/mode/node.pm b/network/cisco/aci/apic/restapi/mode/node.pm index d027d0370..67cf6c4f3 100644 --- a/network/cisco/aci/apic/restapi/mode/node.pm +++ b/network/cisco/aci/apic/restapi/mode/node.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'current' }, { name => 'dn' } ], output_template => 'current: %s %%', output_error_template => "current: %s %%", perfdatas => [ - { label => 'health_current', value => 'current_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'dn_absolute' }, + { label => 'health_current', value => 'current', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'dn' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'min' }, { name => 'dn' } ], output_template => 'min: %s %%', output_error_template => "min: %s %%", perfdatas => [ - { label => 'health_min', value => 'min_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'dn_absolute' }, + { label => 'health_min', value => 'min', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'dn' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'avg' }, { name => 'dn' } ], output_template => 'average: %s %%', output_error_template => "average %s %%", perfdatas => [ - { label => 'health_avg', value => 'avg_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'dn_absolute' }, + { label => 'health_avg', value => 'avg', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'dn' }, ], } }, diff --git a/network/cisco/asa/snmp/mode/failover.pm b/network/cisco/asa/snmp/mode/failover.pm index 6a99d3cfa..22d795d9d 100644 --- a/network/cisco/asa/snmp/mode/failover.pm +++ b/network/cisco/asa/snmp/mode/failover.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'active_units' } ], output_template => 'Active units : %s', perfdatas => [ - { label => 'active_units', value => 'active_units_absolute', template => '%s', + { label => 'active_units', value => 'active_units', template => '%s', min => 0, max => 2 }, ], } diff --git a/network/cisco/callmanager/snmp/mode/ccmusage.pm b/network/cisco/callmanager/snmp/mode/ccmusage.pm index a40ab4beb..24a83e870 100644 --- a/network/cisco/callmanager/snmp/mode/ccmusage.pm +++ b/network/cisco/callmanager/snmp/mode/ccmusage.pm @@ -80,7 +80,7 @@ sub set_counters { key_values => [ { name => $_->[2] } ], output_template => $_->[1], perfdatas => [ - { label => $label, value => $_->[2] . '_absolute', template => '%s', min => 0 }, + { label => $label, value => $_->[2] , template => '%s', min => 0 }, ], } }, diff --git a/network/cisco/callmanager/snmp/mode/ctiusage.pm b/network/cisco/callmanager/snmp/mode/ctiusage.pm index fc3437172..f60a66520 100644 --- a/network/cisco/callmanager/snmp/mode/ctiusage.pm +++ b/network/cisco/callmanager/snmp/mode/ctiusage.pm @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => $_->[2] } ], output_template => $_->[1], perfdatas => [ - { value => $_->[2] . '_absolute', template => '%s', min => 0 }, + { value => $_->[2] , template => '%s', min => 0 }, ], } }, diff --git a/network/cisco/callmanager/snmp/mode/gatewayusage.pm b/network/cisco/callmanager/snmp/mode/gatewayusage.pm index fae840597..a15904ad7 100644 --- a/network/cisco/callmanager/snmp/mode/gatewayusage.pm +++ b/network/cisco/callmanager/snmp/mode/gatewayusage.pm @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => $_->[2] } ], output_template => $_->[1], perfdatas => [ - { label => $label, value => $_->[2] . '_absolute', template => '%s', min => 0 }, + { label => $label, value => $_->[2] , template => '%s', min => 0 }, ], } }, diff --git a/network/cisco/callmanager/snmp/mode/mediadeviceusage.pm b/network/cisco/callmanager/snmp/mode/mediadeviceusage.pm index 9466d56a2..145b61c94 100644 --- a/network/cisco/callmanager/snmp/mode/mediadeviceusage.pm +++ b/network/cisco/callmanager/snmp/mode/mediadeviceusage.pm @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => $_->[2] } ], output_template => $_->[1], perfdatas => [ - { label => $label, value => $_->[2] . '_absolute', template => '%s', min => 0 }, + { label => $label, value => $_->[2] , template => '%s', min => 0 }, ], } }, diff --git a/network/cisco/callmanager/snmp/mode/phoneusage.pm b/network/cisco/callmanager/snmp/mode/phoneusage.pm index 16f76d568..1c0f7fc17 100644 --- a/network/cisco/callmanager/snmp/mode/phoneusage.pm +++ b/network/cisco/callmanager/snmp/mode/phoneusage.pm @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => $_->[2] } ], output_template => $_->[1], perfdatas => [ - { label => $label, value => $_->[2] . '_absolute', template => '%s', min => 0 }, + { label => $label, value => $_->[2] , template => '%s', min => 0 }, ], } }, diff --git a/network/cisco/callmanager/snmp/mode/voicemailusage.pm b/network/cisco/callmanager/snmp/mode/voicemailusage.pm index 5253bf7d2..0a6f0c637 100644 --- a/network/cisco/callmanager/snmp/mode/voicemailusage.pm +++ b/network/cisco/callmanager/snmp/mode/voicemailusage.pm @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => $_->[2] } ], output_template => $_->[1], perfdatas => [ - { value => $_->[2] . '_absolute', template => '%s', min => 0 }, + { value => $_->[2] , template => '%s', min => 0 }, ], } }, diff --git a/network/cisco/meraki/cloudcontroller/restapi/mode/apirequests.pm b/network/cisco/meraki/cloudcontroller/restapi/mode/apirequests.pm index 092c91dda..440738a70 100644 --- a/network/cisco/meraki/cloudcontroller/restapi/mode/apirequests.pm +++ b/network/cisco/meraki/cloudcontroller/restapi/mode/apirequests.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'requests_200' }, { name => 'display' } ], output_template => 'code 200: %s', perfdatas => [ - { value => 'requests_200_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'requests_200', + template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'requests_404' }, { name => 'display' } ], output_template => 'code 404: %s', perfdatas => [ - { value => 'requests_404_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'requests_404', + template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'requests_429' }, { name => 'display' } ], output_template => 'code 429: %s', perfdatas => [ - { value => 'requests_429_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'requests_429', + template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/network/cisco/meraki/cloudcontroller/restapi/mode/devices.pm b/network/cisco/meraki/cloudcontroller/restapi/mode/devices.pm index db4ad3088..f9d5f8796 100644 --- a/network/cisco/meraki/cloudcontroller/restapi/mode/devices.pm +++ b/network/cisco/meraki/cloudcontroller/restapi/mode/devices.pm @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'online'}, { name => 'total'} ], output_template => 'online: %s', perfdatas => [ - { value => 'online_absolute', template => '%s', min => 0, max => 'total_absolute' } + { template => '%s', min => 0, max => 'total' } ] } }, @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'offline'}, { name => 'total'} ], output_template => 'offline: %s', perfdatas => [ - { value => 'offline_absolute', template => '%s', min => 0, max => 'total_absolute' } + { template => '%s', min => 0, max => 'total' } ] } }, @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'alerting'}, { name => 'total'} ], output_template => 'alerting: %s', perfdatas => [ - { value => 'alerting_absolute', template => '%s', min => 0, max => 'total_absolute' } + { template => '%s', min => 0, max => 'total' } ] } }, @@ -97,8 +97,7 @@ sub set_counters { key_values => [ { name => 'assoc' }, { name => 'display' } ], output_template => 'success: %s', perfdatas => [ - { value => 'assoc_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -106,8 +105,7 @@ sub set_counters { key_values => [ { name => 'auth' }, { name => 'display' } ], output_template => 'auth: %s', perfdatas => [ - { value => 'auth_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -115,8 +113,7 @@ sub set_counters { key_values => [ { name => 'assoc' }, { name => 'display' } ], output_template => 'assoc: %s', perfdatas => [ - { value => 'assoc_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -124,8 +121,7 @@ sub set_counters { key_values => [ { name => 'dhcp' }, { name => 'display' } ], output_template => 'dhcp: %s', perfdatas => [ - { value => 'dhcp_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -133,8 +129,7 @@ sub set_counters { key_values => [ { name => 'dns' }, { name => 'display' } ], output_template => 'dns: %s', perfdatas => [ - { value => 'dns_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -142,22 +137,20 @@ sub set_counters { $self->{maps_counters}->{device_traffic} = [ { label => 'traffic-in', nlabel => 'device.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'in: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-out', nlabel => 'device.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/network/cisco/meraki/cloudcontroller/restapi/mode/networks.pm b/network/cisco/meraki/cloudcontroller/restapi/mode/networks.pm index 64e53ef5e..f8c703213 100644 --- a/network/cisco/meraki/cloudcontroller/restapi/mode/networks.pm +++ b/network/cisco/meraki/cloudcontroller/restapi/mode/networks.pm @@ -38,8 +38,7 @@ sub set_counters { key_values => [ { name => 'assoc' }, { name => 'display' } ], output_template => 'connections success: %s', perfdatas => [ - { value => 'assoc_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -47,8 +46,7 @@ sub set_counters { key_values => [ { name => 'auth' }, { name => 'display' } ], output_template => 'connections auth: %s', perfdatas => [ - { value => 'auth_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -56,8 +54,7 @@ sub set_counters { key_values => [ { name => 'assoc' }, { name => 'display' } ], output_template => 'connections assoc: %s', perfdatas => [ - { value => 'assoc_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -65,8 +62,7 @@ sub set_counters { key_values => [ { name => 'dhcp' }, { name => 'display' } ], output_template => 'connections dhcp: %s', perfdatas => [ - { value => 'dhcp_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -74,28 +70,25 @@ sub set_counters { key_values => [ { name => 'dns' }, { name => 'display' } ], output_template => 'connections dns: %s', perfdatas => [ - { value => 'dns_absolute', - template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-in', nlabel => 'network.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-out', nlabel => 'network.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'traffic out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm b/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm index ecdfa8981..4ba0559ce 100644 --- a/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm +++ b/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm @@ -119,7 +119,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total devices : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', min => 0 }, + { label => 'total', template => '%s', min => 0 }, ], } }, @@ -138,8 +138,8 @@ sub set_counters { key_values => [ { name => 'clients' }, { name => 'display' } ], output_template => 'Clients : %s', perfdatas => [ - { label => 'clients', value => 'clients_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'clients', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -148,7 +148,6 @@ sub set_counters { $self->{maps_counters}->{interface} = [ { label => 'in', set => { key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_traffic_output'), closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -157,7 +156,6 @@ sub set_counters { }, { label => 'out', set => { key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_traffic_output'), closure_custom_perfdata => $self->can('custom_traffic_perfdata'), diff --git a/network/cisco/prime/restapi/mode/apusage.pm b/network/cisco/prime/restapi/mode/apusage.pm index 64dff0f7f..ef8c06042 100644 --- a/network/cisco/prime/restapi/mode/apusage.pm +++ b/network/cisco/prime/restapi/mode/apusage.pm @@ -48,14 +48,14 @@ sub custom_status_calc { sub custom_uptime_output { my ($self, %options) = @_; - my $msg = 'uptime started since : ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{uptime_absolute}); + my $msg = 'uptime started since : ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{uptime}); return $msg; } sub custom_lwappuptime_output { my ($self, %options) = @_; - my $msg = 'lwapp uptime started since : ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{lwapp_uptime_absolute}); + my $msg = 'lwapp uptime started since : ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{lwapp_uptime}); return $msg; } @@ -81,8 +81,8 @@ sub set_counters { key_values => [ { name => 'client_count' }, { name => 'name' } ], output_template => 'Clients : %s', perfdatas => [ - { label => 'ap_clients', value => 'client_count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'ap_clients', value => 'client_count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -90,8 +90,8 @@ sub set_counters { key_values => [ { name => 'uptime' }, { name => 'name' } ], closure_custom_output => $self->can('custom_uptime_output'), perfdatas => [ - { label => 'ap_uptime', value => 'uptime_absolute', template => '%s', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'ap_uptime', value => 'uptime', template => '%s', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -99,8 +99,8 @@ sub set_counters { key_values => [ { name => 'lwapp_uptime' }, { name => 'name' } ], closure_custom_output => $self->can('custom_lwappuptime_output'), perfdatas => [ - { label => 'ap_lwappuptime', value => 'lwapp_uptime_absolute', template => '%s', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'ap_lwappuptime', value => 'lwapp_uptime', template => '%s', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -111,8 +111,8 @@ sub set_counters { key_values => [ { name => 'ap_count' }, { name => 'name' } ], output_template => 'Number of access points : %s', perfdatas => [ - { label => 'ctrl_ap_count', value => 'ap_count_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'ctrl_ap_count', value => 'ap_count', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/network/cisco/standard/ssh/mode/cpu.pm b/network/cisco/standard/ssh/mode/cpu.pm index 399600482..8964a2c85 100644 --- a/network/cisco/standard/ssh/mode/cpu.pm +++ b/network/cisco/standard/ssh/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'average_5s' } ], output_template => '%.2f %% (5s)', perfdatas => [ - { label => 'total_cpu_5s_avg', value => 'average_5s_absolute', template => '%.2f', + { label => 'total_cpu_5s_avg', value => 'average_5s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'average_1m' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { label => 'total_cpu_1m_avg', value => 'average_1m_absolute', template => '%.2f', + { label => 'total_cpu_1m_avg', value => 'average_1m', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'average_5m' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { label => 'total_cpu_5m_avg', value => 'average_5m_absolute', template => '%.2f', + { label => 'total_cpu_5m_avg', value => 'average_5m', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/cisco/standard/ssh/mode/voicedialpeer.pm b/network/cisco/standard/ssh/mode/voicedialpeer.pm index a667f7cc8..4b89696dd 100644 --- a/network/cisco/standard/ssh/mode/voicedialpeer.pm +++ b/network/cisco/standard/ssh/mode/voicedialpeer.pm @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'peers total %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 }, + { value => 'total', template => '%s', min => 0 }, ], } }, @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'oper_up' } ], output_template => 'peers operational up %s', perfdatas => [ - { value => 'oper_up_absolute', template => '%s', min => 0 }, + { value => 'oper_up', template => '%s', min => 0 }, ], } }, diff --git a/network/cisco/vcs/restapi/mode/calls.pm b/network/cisco/vcs/restapi/mode/calls.pm index bafebd105..d8c20dc7d 100644 --- a/network/cisco/vcs/restapi/mode/calls.pm +++ b/network/cisco/vcs/restapi/mode/calls.pm @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'Traversal' } ], output_template => 'Traversal: %d', perfdatas => [ - { label => 'traversal', value => 'Traversal_absolute', template => '%d', + { label => 'traversal', value => 'Traversal', template => '%d', min => 0, unit => 'calls' }, ], } @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'NonTraversal' } ], output_template => 'Non Traversal: %d', perfdatas => [ - { label => 'non_traversal', value => 'NonTraversal_absolute', template => '%d', + { label => 'non_traversal', value => 'NonTraversal', template => '%d', min => 0, unit => 'calls' }, ], } @@ -74,7 +74,7 @@ sub set_counters { key_values => [ { name => 'CollaborationEdge' } ], output_template => 'Collaboration Edge: %d', perfdatas => [ - { label => 'collaboration_edge', value => 'CollaborationEdge_absolute', template => '%d', + { label => 'collaboration_edge', value => 'CollaborationEdge', template => '%d', min => 0, unit => 'calls' }, ], } @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'Cloud' } ], output_template => 'Cloud: %d', perfdatas => [ - { label => 'cloud', value => 'Cloud_absolute', template => '%d', + { label => 'cloud', value => 'Cloud', template => '%d', min => 0, unit => 'calls' }, ], } @@ -92,7 +92,7 @@ sub set_counters { key_values => [ { name => 'MicrosoftContent' } ], output_template => 'Microsoft Content: %d', perfdatas => [ - { label => 'microsoft_content', value => 'MicrosoftContent_absolute', template => '%d', + { label => 'microsoft_content', value => 'MicrosoftContent', template => '%d', min => 0, unit => 'calls' }, ], } @@ -101,7 +101,7 @@ sub set_counters { key_values => [ { name => 'MicrosoftIMP' } ], output_template => 'Microsoft IMP: %d', perfdatas => [ - { label => 'microsoft_imp', value => 'MicrosoftIMP_absolute', template => '%d', + { label => 'microsoft_imp', value => 'MicrosoftIMP', template => '%d', min => 0, unit => 'calls' }, ], } diff --git a/network/cisco/vcs/restapi/mode/httpproxystats.pm b/network/cisco/vcs/restapi/mode/httpproxystats.pm index f8c8a0432..405356ab0 100644 --- a/network/cisco/vcs/restapi/mode/httpproxystats.pm +++ b/network/cisco/vcs/restapi/mode/httpproxystats.pm @@ -63,106 +63,88 @@ sub set_counters { ]; $self->{maps_counters}->{connections} = [ { label => 'client-connections', set => { - key_values => [ { name => 'TotalClientConnection', diff => 1 } ], + key_values => [ { name => 'TotalClientConnection', per_second => 1 } ], output_template => 'Client: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'client_connections', value => 'TotalClientConnection_per_second', template => '%.2f', - min => 0, unit => 'connections/s' }, + { label => 'client_connections', template => '%.2f', min => 0, unit => 'connections/s' }, ], } }, { label => 'server-connections', set => { - key_values => [ { name => 'TotalServerConnection', diff => 1 } ], + key_values => [ { name => 'TotalServerConnection', per_second => 1 } ], output_template => 'Server: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'server_connections', value => 'TotalServerConnection_per_second', template => '%.2f', - min => 0, unit => 'connections/s' }, + { label => 'server_connections', template => '%.2f', min => 0, unit => 'connections/s' }, ], } - }, + } ]; + $self->{maps_counters}->{requests} = [ { label => 'completed-requests', set => { - key_values => [ { name => 'CompletedRequests', diff => 1 } ], + key_values => [ { name => 'CompletedRequests', per_second => 1 } ], output_template => 'Completed: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'completed_requests', value => 'CompletedRequests_per_second', template => '%.2f', - min => 0, unit => 'requests/s' }, + { label => 'completed_requests', template => '%.2f', min => 0, unit => 'requests/s' }, ], } }, { label => 'get-requests', set => { - key_values => [ { name => 'GetRequests', diff => 1 } ], + key_values => [ { name => 'GetRequests', per_second => 1 } ], output_template => 'Get: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'get_requests', value => 'GetRequests_per_second', template => '%.2f', - min => 0, unit => 'requests/s' }, + { label => 'get_requests', template => '%.2f', min => 0, unit => 'requests/s' }, ], } }, { label => 'post-requests', set => { - key_values => [ { name => 'PostRequests', diff => 1 } ], + key_values => [ { name => 'PostRequests', per_second => 1 } ], output_template => 'Post: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'post_requests', value => 'PostRequests_per_second', template => '%.2f', - min => 0, unit => 'requests/s' }, + { label => 'post_requests', template => '%.2f', min => 0, unit => 'requests/s' }, ], } - }, + } ]; + $self->{maps_counters}->{responses} = [ { label => 'responses-1xx', set => { - key_values => [ { name => 'Response1XXCount', diff => 1 } ], + key_values => [ { name => 'Response1XXCount', per_second => 1 } ], output_template => '1XX: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'responses_1xx', value => 'Response1XXCount_per_second', template => '%.2f', - min => 0, unit => 'responses/s' }, + { label => 'responses_1xx', template => '%.2f', min => 0, unit => 'responses/s' }, ], } }, { label => 'responses-2xx', set => { - key_values => [ { name => 'Response2XXCount', diff => 1 } ], + key_values => [ { name => 'Response2XXCount', per_second => 1 } ], output_template => '2XX: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'responses_2xx', value => 'Response2XXCount_per_second', template => '%.2f', - min => 0, unit => 'responses/s' }, + { label => 'responses_2xx', template => '%.2f', min => 0, unit => 'responses/s' }, ], } }, { label => 'responses-3xx', set => { - key_values => [ { name => 'Response3XXCount', diff => 1 } ], + key_values => [ { name => 'Response3XXCount', per_second => 1 } ], output_template => '3XX: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'responses_3xx', value => 'Response3XXCount_per_second', template => '%.2f', - min => 0, unit => 'responses/s' }, + { label => 'responses_3xx', template => '%.2f', min => 0, unit => 'responses/s' }, ], } }, { label => 'responses-4xx', set => { - key_values => [ { name => 'Response4XXCount', diff => 1 } ], + key_values => [ { name => 'Response4XXCount', per_second => 1 } ], output_template => '4XX: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'responses_4xx', value => 'Response4XXCount_per_second', template => '%.2f', - min => 0, unit => 'responses/s' }, + { label => 'responses_4xx', template => '%.2f', min => 0, unit => 'responses/s' }, ], } }, { label => 'responses-5xx', set => { - key_values => [ { name => 'Response5XXCount', diff => 1 } ], + key_values => [ { name => 'Response5XXCount', per_second => 1 } ], output_template => '5XX: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'responses_5xx', value => 'Response5XXCount_per_second', template => '%.2f', - min => 0, unit => 'responses/s' }, + { label => 'responses_5xx', template => '%.2f', min => 0, unit => 'responses/s' }, ], } }, @@ -192,12 +174,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters' }, - "warning-status:s" => { name => 'warning_status' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} ne "Active"' }, - }); + $options{options}->add_options(arguments => { + 'warning-status:s' => { name => 'warning_status' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} ne "Active"' } + }); return $self; } diff --git a/network/cisco/vcs/restapi/mode/zones.pm b/network/cisco/vcs/restapi/mode/zones.pm index 1b075e05f..fa5fdfc8a 100644 --- a/network/cisco/vcs/restapi/mode/zones.pm +++ b/network/cisco/vcs/restapi/mode/zones.pm @@ -58,72 +58,65 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Number of zones: %d', perfdatas => [ - { label => 'zones_count', value => 'count_absolute', template => '%d', - min => 0 }, - ], + { label => 'zones_count', template => '%d', min => 0 } + ] } - }, + } ]; + $self->{maps_counters}->{searches} = [ { label => 'searches-total', set => { - key_values => [ { name => 'Total', diff => 1 } ], + key_values => [ { name => 'Total', per_second => 1 } ], output_template => 'Total: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'searches_total', value => 'Total_per_second', template => '%.2f', - min => 0, unit => 'searches/s' }, + { label => 'searches_total', template => '%.2f', min => 0, unit => 'searches/s' }, ], } }, { label => 'searches-dropped', set => { - key_values => [ { name => 'Dropped', diff => 1 } ], + key_values => [ { name => 'Dropped', per_second => 1 } ], output_template => 'Dropped: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'searches_dropped', value => 'Dropped_per_second', template => '%.2f', - min => 0, unit => 'searches/s' }, + { label => 'searches_dropped', template => '%.2f', min => 0, unit => 'searches/s' }, ], } }, { label => 'searches-max-sub-search-exceeded', set => { - key_values => [ { name => 'MaxSubSearchExceeded', diff => 1 } ], + key_values => [ { name => 'MaxSubSearchExceeded', per_second => 1 } ], output_template => 'Max Sub Search Exceeded: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'searches_max_sub_search_exceeded', value => 'MaxSubSearchExceeded_per_second', template => '%.2f', + { label => 'searches_max_sub_search_exceeded', template => '%.2f', min => 0, unit => 'searches/s' }, ], } }, { label => 'searches-max-targets-exceeded', set => { - key_values => [ { name => 'MaxTargetsExceeded', diff => 1 } ], + key_values => [ { name => 'MaxTargetsExceeded', per_second => 1 } ], output_template => 'Max Targets Exceeded: %.2f/s', - per_second => 1, perfdatas => [ - { label => 'searches_max_targets_exceeded', value => 'MaxTargetsExceeded_per_second', template => '%.2f', - min => 0, unit => 'searches/s' }, + { label => 'searches_max_targets_exceeded', template => '%.2f', min => 0, unit => 'searches/s' }, ], } - }, + } ]; + $self->{maps_counters}->{zones} = [ { label => 'status', set => { key_values => [ { name => 'Status' }, { name => 'Type' }, { name => 'Name' } ], closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'calls-count', set => { key_values => [ { name => 'Calls' }, { name => 'Name' } ], output_template => 'Number of Calls: %d', perfdatas => [ - { label => 'calls_count', value => 'Calls_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'Name_absolute' }, - ], + { label => 'calls_count', template => '%d', min => 0, label_extra_instance => 1, instance_use => 'Name' } + ] } - }, + } ]; } @@ -144,12 +137,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-counters:s" => { name => 'filter_counters' }, - "warning-status:s" => { name => 'warning_status' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} ne "Active"' }, - }); + $options{options}->add_options(arguments => { + 'warning-status:s' => { name => 'warning_status' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} ne "Active"' } + }); return $self; } diff --git a/network/citrix/appacceleration/snmp/mode/cpu.pm b/network/citrix/appacceleration/snmp/mode/cpu.pm index c4d8fee1e..10785d0db 100644 --- a/network/citrix/appacceleration/snmp/mode/cpu.pm +++ b/network/citrix/appacceleration/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu' } ], output_template => 'CPU Usage : %.2f%% (1min)', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', + { label => 'cpu', value => 'cpu', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'load' } ], output_template => 'Load : %s', perfdatas => [ - { label => 'load', value => 'load_absolute', template => '%s', + { label => 'load', value => 'load', template => '%s', min => 0 }, ], } diff --git a/network/citrix/appacceleration/snmp/mode/serviceclassusage.pm b/network/citrix/appacceleration/snmp/mode/serviceclassusage.pm index 12064ce1e..df6539cda 100644 --- a/network/citrix/appacceleration/snmp/mode/serviceclassusage.pm +++ b/network/citrix/appacceleration/snmp/mode/serviceclassusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'wsScsCurrentAcceleratedConnections' }, { name => 'display' } ], output_template => 'Current Accelerated Connections : %s', perfdatas => [ - { label => 'current_accelerated_connections', value => 'wsScsCurrentAcceleratedConnections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_accelerated_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'wsScsTotalAcceleratedConnections', diff => 1 }, { name => 'display' } ], output_template => 'Total Accelerated Connections : %s', perfdatas => [ - { label => 'total_accelerated_connections', value => 'wsScsTotalAcceleratedConnections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_accelerated_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,48 +56,48 @@ sub set_counters { key_values => [ { name => 'wsScsTotalNonAcceleratedConnections', diff => 1 }, { name => 'display' } ], output_template => 'Total Non Accelerated Connections : %s', perfdatas => [ - { label => 'total_nonaccelerated_connections', value => 'wsScsTotalNonAcceleratedConnections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_nonaccelerated_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'wsScsPreCompressReceivedOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'wsScsPreCompressReceivedOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'wsScsPreCompressReceivedOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in-compressed', set => { - key_values => [ { name => 'wsScsCompressReceivedOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'wsScsCompressReceivedOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In Compressed : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in_compressed', value => 'wsScsCompressReceivedOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_compressed', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'wsScsPreCompressSentOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'wsScsPreCompressSentOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'wsScsPreCompressSentOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out-compressed', set => { - key_values => [ { name => 'wsScsCompressSentOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'wsScsCompressSentOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out Compressed : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out_compressed', value => 'wsScsCompressSentOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_compressed', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -115,11 +115,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); + return $self; } diff --git a/network/citrix/netscaler/snmp/mode/connections.pm b/network/citrix/netscaler/snmp/mode/connections.pm index 303753a2e..22f032fcb 100644 --- a/network/citrix/netscaler/snmp/mode/connections.pm +++ b/network/citrix/netscaler/snmp/mode/connections.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'active' } ], output_template => 'Active Server TCP connections : %s', perfdatas => [ - { label => 'active_server', value => 'active_absolute', template => '%s', + { label => 'active_server', value => 'active', template => '%s', unit => 'con', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'server' } ], output_template => 'Server TCP connections : %s', perfdatas => [ - { label => 'server', value => 'server_absolute', template => '%s', + { label => 'server', value => 'server', template => '%s', unit => 'con', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'client' } ], output_template => 'Client TCP connections : %s', perfdatas => [ - { label => 'client', value => 'client_absolute', template => '%s', + { label => 'client', value => 'client', template => '%s', unit => 'con', min => 0 }, ], } diff --git a/network/citrix/netscaler/snmp/mode/vserverstatus.pm b/network/citrix/netscaler/snmp/mode/vserverstatus.pm index 0a7b93dc5..ae570f0dd 100644 --- a/network/citrix/netscaler/snmp/mode/vserverstatus.pm +++ b/network/citrix/netscaler/snmp/mode/vserverstatus.pm @@ -46,28 +46,28 @@ sub set_counters { key_values => [ { name => 'health' }, { name => 'display' } ], output_template => 'Health: %.2f %%', output_error_template => 'Health: %s', perfdatas => [ - { value => 'health_absolute', label => 'health', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'health', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'in-traffic', set => { - key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'in', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'out-traffic', set => { - key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'out', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'clients', diff => 1 }, { name => 'display' } ], output_template => 'Total Client Connections : %s', perfdatas => [ - { label => 'clients', value => 'clients_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'clients', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -84,8 +84,8 @@ sub set_counters { key_values => [ { name => 'servers', diff => 1 }, { name => 'display' } ], output_template => 'Total Server Connections : %s', perfdatas => [ - { label => 'servers', value => 'servers_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'servers', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -156,9 +156,9 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - 'filter-name:s' => { name => 'filter_name' }, - 'filter-type:s' => { name => 'filter_type' }, - 'threshold-overload:s@' => { name => 'threshold_overload' }, + 'filter-name:s' => { name => 'filter_name' }, + 'filter-type:s' => { name => 'filter_type' }, + 'threshold-overload:s@' => { name => 'threshold_overload' }, }); return $self; diff --git a/network/citrix/sdx/snmp/mode/diskusage.pm b/network/citrix/sdx/snmp/mode/diskusage.pm index 6c6eeeb0b..279420cba 100644 --- a/network/citrix/sdx/snmp/mode/diskusage.pm +++ b/network/citrix/sdx/snmp/mode/diskusage.pm @@ -109,22 +109,20 @@ sub set_counters { } }, { label => 'read-iops', set => { - key_values => [ { name => 'diskTotalBlocksRead', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'diskTotalBlocksRead', per_second => 1 }, { name => 'display' } ], output_template => 'Read IOPs : %.2f', output_error_template => "Read IOPs : %s", perfdatas => [ - { label => 'read_iops', value => 'diskTotalBlocksRead_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-iops', set => { - key_values => [ { name => 'diskTotalBlocksWritten', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'diskTotalBlocksWritten', per_second => 1 }, { name => 'display' } ], output_template => 'Write IOPs : %.2f', output_error_template => "Write IOPs : %s", perfdatas => [ - { label => 'write_iops', value => 'diskTotalBlocksWritten_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -137,9 +135,9 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "units:s" => { name => 'units', default => '%' }, - "free" => { name => 'free' }, + 'filter-name:s' => { name => 'filter_name' }, + 'units:s' => { name => 'units', default => '%' }, + 'free' => { name => 'free' }, }); return $self; diff --git a/network/citrix/sdx/snmp/mode/xenusage.pm b/network/citrix/sdx/snmp/mode/xenusage.pm index 06ae42129..35b9d372a 100644 --- a/network/citrix/sdx/snmp/mode/xenusage.pm +++ b/network/citrix/sdx/snmp/mode/xenusage.pm @@ -111,8 +111,8 @@ sub set_counters { key_values => [ { name => 'xenCpuUsage' }, { name => 'display' } ], output_template => 'CPU Usage : %.2f %%', output_error_template => "CPU Usage : %s", perfdatas => [ - { label => 'cpu_usage', value => 'xenCpuUsage_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_usage', value => 'xenCpuUsage', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/colubris/snmp/mode/apusage.pm b/network/colubris/snmp/mode/apusage.pm index 312479c66..d5c16db89 100644 --- a/network/colubris/snmp/mode/apusage.pm +++ b/network/colubris/snmp/mode/apusage.pm @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'total_ap' } ], output_template => 'total AP: %s', perfdatas => [ - { label => 'total_ap', value => 'total_ap_absolute', template => '%s', min => 0 }, + { label => 'total_ap', value => 'total_ap', template => '%s', min => 0 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'total_users' } ], output_template => 'total users: %s', perfdatas => [ - { label => 'total_users', value => 'total_users_absolute', template => '%s', min => 0 }, + { label => 'total_users', value => 'total_users', template => '%s', min => 0 }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'users' }, { name => 'display' } ], output_template => 'current users: %s', perfdatas => [ - { label => 'ap_users', value => 'users_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ap_users', value => 'users', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/colubris/snmp/mode/cpu.pm b/network/colubris/snmp/mode/cpu.pm index fb32b1436..61e1d3e79 100644 --- a/network/colubris/snmp/mode/cpu.pm +++ b/network/colubris/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'usage_now' } ], output_template => '%.2f %% (current)', perfdatas => [ - { label => 'cpu_current', value => 'usage_now_absolute', template => '%.2f', + { label => 'cpu_current', value => 'usage_now', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'usage_5s' } ], output_template => '%.2f %% (5sec)', perfdatas => [ - { label => 'cpu_5s', value => 'usage_5s_absolute', template => '%.2f', + { label => 'cpu_5s', value => 'usage_5s', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'usage_10s' } ], output_template => '%.2f %% (10sec)', perfdatas => [ - { label => 'cpu_10s', value => 'usage_10s_absolute', template => '%.2f', + { label => 'cpu_10s', value => 'usage_10s', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'usage_20s' } ], output_template => '%.2f %% (5sec)', perfdatas => [ - { label => 'cpu_20s', value => 'usage_20s_absolute', template => '%.2f', + { label => 'cpu_20s', value => 'usage_20s', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/network/colubris/snmp/mode/load.pm b/network/colubris/snmp/mode/load.pm index 00ea0dee2..e2a9e757d 100644 --- a/network/colubris/snmp/mode/load.pm +++ b/network/colubris/snmp/mode/load.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'load1' } ], output_template => '%s', perfdatas => [ - { label => 'load1', value => 'load1_absolute', template => '%s', min => 0 }, + { label => 'load1', value => 'load1', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'load5' } ], output_template => '%s', perfdatas => [ - { label => 'load5', value => 'load5_absolute', template => '%s', min => 0 }, + { label => 'load5', value => 'load5', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'load15' } ], output_template => '%s', perfdatas => [ - { label => 'load15', value => 'load15_absolute', template => '%s', min => 0 }, + { label => 'load15', value => 'load15', template => '%s', min => 0 }, ], } }, diff --git a/network/colubris/snmp/mode/storage.pm b/network/colubris/snmp/mode/storage.pm index 4f9e3c39a..c65ea08cd 100644 --- a/network/colubris/snmp/mode/storage.pm +++ b/network/colubris/snmp/mode/storage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'perm_used' } ], output_template => 'Permanent Storage Used: %.2f%%', perfdatas => [ - { label => 'storage_permanent_used', value => 'perm_used_absolute', template => '%.2f', + { label => 'storage_permanent_used', value => 'perm_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'temp_used' } ], output_template => 'Temporary Storage Used: %.2f%%', perfdatas => [ - { label => 'storage_temporary_used', value => 'temp_used_absolute', template => '%.2f', + { label => 'storage_temporary_used', value => 'temp_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/cyberoam/snmp/mode/requests.pm b/network/cyberoam/snmp/mode/requests.pm index 731b23bfb..b898c01a2 100644 --- a/network/cyberoam/snmp/mode/requests.pm +++ b/network/cyberoam/snmp/mode/requests.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'live_users' } ], output_template => 'live users = %s', perfdatas => [ - { label => 'live_users', value => 'live_users_absolute', template => '%s', min => 0 }, + { label => 'live_users', value => 'live_users', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'http_hits', diff => 1 } ], output_template => 'http hits = %s', perfdatas => [ - { label => 'http_hits', value => 'http_hits_absolute', template => '%s', min => 0 }, + { label => 'http_hits', value => 'http_hits', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'ftp_hits', diff => 1 } ], output_template => 'ftp hits = %s', perfdatas => [ - { label => 'ftp_hits', value => 'ftp_hits_absolute', template => '%s', min => 0 }, + { label => 'ftp_hits', value => 'ftp_hits', template => '%s', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'pop3_hits', diff => 1 } ], output_template => 'pop3 hits = %s', perfdatas => [ - { label => 'pop3_hits', value => 'pop3_hits_absolute', template => '%s', min => 0 }, + { label => 'pop3_hits', value => 'pop3_hits', template => '%s', min => 0 }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'imap_hits', diff => 1 } ], output_template => 'imap hits = %s', perfdatas => [ - { label => 'imap_hits', value => 'imap_hits_absolute', template => '%s', min => 0 }, + { label => 'imap_hits', value => 'imap_hits', template => '%s', min => 0 }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'smtp_hits', diff => 1 } ], output_template => 'smtp hits = %s', perfdatas => [ - { label => 'smtp_hits', value => 'smtp_hits_absolute', template => '%s', min => 0 }, + { label => 'smtp_hits', value => 'smtp_hits', template => '%s', min => 0 }, ], } }, diff --git a/network/digi/sarian/snmp/mode/gprs.pm b/network/digi/sarian/snmp/mode/gprs.pm index 63128c4d5..5d88e9bc9 100644 --- a/network/digi/sarian/snmp/mode/gprs.pm +++ b/network/digi/sarian/snmp/mode/gprs.pm @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'signal' } ], output_template => 'Signal : %d dBm', perfdatas => [ - { label => 'signal_strenght', value => 'signal_absolute', template => '%s', + { label => 'signal_strenght', value => 'signal', template => '%s', unit => 'dBm' }, ], } diff --git a/network/digi/sarian/snmp/mode/temperature.pm b/network/digi/sarian/snmp/mode/temperature.pm index 0746e0df2..0fbddcc61 100644 --- a/network/digi/sarian/snmp/mode/temperature.pm +++ b/network/digi/sarian/snmp/mode/temperature.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'device' } ], output_template => 'Temp Device : %d °C', perfdatas => [ - { label => 'tempDevice', value => 'device_absolute', template => '%d', + { label => 'tempDevice', value => 'device', template => '%d', unit => 'C' }, ], } @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'processor' } ], output_template => 'Temp Processor : %d °C', perfdatas => [ - { label => 'tempProcessor', value => 'processor_absolute', template => '%d', + { label => 'tempProcessor', value => 'processor', template => '%d', unit => 'C' }, ], } @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'modem' } ], output_template => 'Temp Modem : %d °C', perfdatas => [ - { label => 'tempModem', value => 'modem_absolute', template => '%d', + { label => 'tempModem', value => 'modem', template => '%d', unit => 'C' }, ], } diff --git a/network/efficientip/snmp/mode/dhcpusage.pm b/network/efficientip/snmp/mode/dhcpusage.pm index 9e2e9739c..c7c4f4302 100644 --- a/network/efficientip/snmp/mode/dhcpusage.pm +++ b/network/efficientip/snmp/mode/dhcpusage.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'ack', diff => 1 } ], output_template => 'Ack : %s', perfdatas => [ - { label => 'ack', value => 'ack_absolute', template => '%s', min => 0 }, + { label => 'ack', value => 'ack', template => '%s', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'nack', diff => 1 } ], output_template => 'Nack : %s', perfdatas => [ - { label => 'nack', value => 'nack_absolute', template => '%s', min => 0 }, + { label => 'nack', value => 'nack', template => '%s', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'offer', diff => 1 } ], output_template => 'Offer : %s', perfdatas => [ - { label => 'offer', value => 'offer_absolute', template => '%s', min => 0 }, + { label => 'offer', value => 'offer', template => '%s', min => 0 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'inform', diff => 1 } ], output_template => 'Inform : %s', perfdatas => [ - { label => 'inform', value => 'inform_absolute', template => '%s', min => 0 }, + { label => 'inform', value => 'inform', template => '%s', min => 0 }, ], } }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'decline', diff => 1 } ], output_template => 'Decline : %s', perfdatas => [ - { label => 'decline', value => 'decline_absolute', template => '%s', min => 0 }, + { label => 'decline', value => 'decline', template => '%s', min => 0 }, ], } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'release', diff => 1 } ], output_template => 'Release : %s', perfdatas => [ - { label => 'release', value => 'release_absolute', template => '%s', min => 0 }, + { label => 'release', value => 'release', template => '%s', min => 0 }, ], } }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'request', diff => 1 } ], output_template => 'Request : %s', perfdatas => [ - { label => 'request', value => 'request_absolute', template => '%s', min => 0 }, + { label => 'request', value => 'request', template => '%s', min => 0 }, ], } }, @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'discover', diff => 1 } ], output_template => 'Discover : %s', perfdatas => [ - { label => 'discover', value => 'discover_absolute', template => '%s', min => 0 }, + { label => 'discover', value => 'discover', template => '%s', min => 0 }, ], } }, diff --git a/network/efficientip/snmp/mode/dnsusage.pm b/network/efficientip/snmp/mode/dnsusage.pm index 74ef231cf..e8be9daec 100644 --- a/network/efficientip/snmp/mode/dnsusage.pm +++ b/network/efficientip/snmp/mode/dnsusage.pm @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => $map[$i], diff => 1 } ], output_template => $map[$i + 1], perfdatas => [ - { label => $map[$i], value => $map[$i] . '_absolute', template => '%s', min => 0 }, + { label => $map[$i], value => $map[$i] , template => '%s', min => 0 }, ], } }, diff --git a/network/extreme/snmp/mode/cpu.pm b/network/extreme/snmp/mode/cpu.pm index 49cb13891..74998fd54 100644 --- a/network/extreme/snmp/mode/cpu.pm +++ b/network/extreme/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total CPU Usage : %.2f %%', perfdatas => [ - { label => 'cpu_total', value => 'total_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'cpu_total', value => 'total', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => 'extremeCpuMonitorSystemUtilization5secs' }, { name => 'num' }, ], output_template => '5 seconds : %.2f %%', perfdatas => [ - { label => 'cpu_5secs', value => 'extremeCpuMonitorSystemUtilization5secs_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num_absolute' }, + { label => 'cpu_5secs', value => 'extremeCpuMonitorSystemUtilization5secs', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num' }, ], } }, @@ -57,8 +57,8 @@ sub set_counters { key_values => [ { name => 'extremeCpuMonitorSystemUtilization10secs' }, { name => 'num' }, ], output_template => '10 seconds : %.2f %%', perfdatas => [ - { label => 'cpu_10secs', value => 'extremeCpuMonitorSystemUtilization10secs_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num_absolute' }, + { label => 'cpu_10secs', value => 'extremeCpuMonitorSystemUtilization10secs', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num' }, ], } }, @@ -66,8 +66,8 @@ sub set_counters { key_values => [ { name => 'extremeCpuMonitorSystemUtilization30secs' }, { name => 'num' }, ], output_template => '30 seconds : %.2f %%', perfdatas => [ - { label => 'cpu_30secs', value => 'extremeCpuMonitorSystemUtilization30secs_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num_absolute' }, + { label => 'cpu_30secs', value => 'extremeCpuMonitorSystemUtilization30secs', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num' }, ], } }, @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'extremeCpuMonitorSystemUtilization1min' }, { name => 'num' }, ], output_template => '1 minute : %.2f %%', perfdatas => [ - { label => 'cpu_1min', value => 'extremeCpuMonitorSystemUtilization1min_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num_absolute' }, + { label => 'cpu_1min', value => 'extremeCpuMonitorSystemUtilization1min', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num' }, ], } }, @@ -84,8 +84,8 @@ sub set_counters { key_values => [ { name => 'extremeCpuMonitorSystemUtilization5mins' }, { name => 'num' }, ], output_template => '5 minutes : %.2f %%', perfdatas => [ - { label => 'cpu_5min', value => 'extremeCpuMonitorSystemUtilization5mins_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num_absolute' }, + { label => 'cpu_5min', value => 'extremeCpuMonitorSystemUtilization5mins', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num' }, ], } }, diff --git a/network/f5/bigip/snmp/mode/apm.pm b/network/f5/bigip/snmp/mode/apm.pm index 0a9137376..8f117a94e 100644 --- a/network/f5/bigip/snmp/mode/apm.pm +++ b/network/f5/bigip/snmp/mode/apm.pm @@ -43,7 +43,7 @@ sub set_counters { key_values => [ { name => 'apmAccessStatTotalSessions', diff => 1 } ], output_template => 'created sessions: %s', perfdatas => [ - { value => 'apmAccessStatTotalSessions_absolute', template => '%s', min => 0 }, + { value => 'apmAccessStatTotalSessions', template => '%s', min => 0 }, ], } }, @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'apmAccessStatCurrentActiveSessions' } ], output_template => 'active sessions: %s', perfdatas => [ - { value => 'apmAccessStatCurrentActiveSessions_absolute', template => '%s', min => 0 }, + { value => 'apmAccessStatCurrentActiveSessions', template => '%s', min => 0 }, ], } }, @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'apmAccessStatCurrentPendingSessions' } ], output_template => 'pending sessions: %s', perfdatas => [ - { value => 'apmAccessStatCurrentPendingSessions_absolute', template => '%s', min => 0 }, + { value => 'apmAccessStatCurrentPendingSessions', template => '%s', min => 0 }, ], } }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'apmPaStatTotalSessions', diff => 1 } ], output_template => 'created sessions: %s', perfdatas => [ - { value => 'apmPaStatTotalSessions_absolute', template => '%s', + { value => 'apmPaStatTotalSessions', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -79,7 +79,7 @@ sub set_counters { key_values => [ { name => 'apmPaStatCurrentActiveSessions' } ], output_template => 'active sessions: %s', perfdatas => [ - { value => 'apmPaStatCurrentActiveSessions_absolute', template => '%s', + { value => 'apmPaStatCurrentActiveSessions', template => '%s', min => 0, label_extra_instance => 1 }, ], } @@ -88,7 +88,7 @@ sub set_counters { key_values => [ { name => 'apmPaStatCurrentPendingSessions' } ], output_template => 'pending sessions: %s', perfdatas => [ - { value => 'apmPaStatCurrentPendingSessions_absolute', template => '%s', + { value => 'apmPaStatCurrentPendingSessions', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/network/f5/bigip/snmp/mode/connections.pm b/network/f5/bigip/snmp/mode/connections.pm index 9bf093eb6..66926e429 100644 --- a/network/f5/bigip/snmp/mode/connections.pm +++ b/network/f5/bigip/snmp/mode/connections.pm @@ -47,8 +47,7 @@ sub set_counters { key_values => [ { name => 'client' } ], output_template => 'Current client connections : %s', perfdatas => [ - { label => 'Client', value => 'client_absolute', template => '%s', - min => 0, unit => 'con' }, + { label => 'Client', template => '%s', min => 0, unit => 'con' }, ], } }, @@ -56,8 +55,7 @@ sub set_counters { key_values => [ { name => 'client_ssl' } ], output_template => 'Current client SSL connections : %s', perfdatas => [ - { label => 'ClientSSL', value => 'client_ssl_absolute', template => '%s', - min => 0, unit => 'con' }, + { label => 'ClientSSL', template => '%s', min => 0, unit => 'con' }, ], } }, @@ -65,7 +63,6 @@ sub set_counters { key_values => [ { name => 'client_ssl_tot_native', diff => 1 }, { name => 'client_ssl_tot_compat', diff => 1 } ], output_template => 'TPS client SSL connections : %.2f', threshold_use => 'client_ssl_tps', output_use => 'client_ssl_tps', closure_custom_calc => $self->can('custom_client_tps_calc'), - per_second => 1, perfdatas => [ { label => 'ClientSSL_Tps', value => 'client_ssl_tps', template => '%.2f', unit => 'tps', min => 0 }, @@ -76,8 +73,7 @@ sub set_counters { key_values => [ { name => 'server' } ], output_template => 'Current server connections: %s', perfdatas => [ - { label => 'Server', value => 'server_absolute', template => '%s', - min => 0, unit => 'con' }, + { label => 'Server', template => '%s', min => 0, unit => 'con' }, ], } }, @@ -85,8 +81,7 @@ sub set_counters { key_values => [ { name => 'server_ssl' } ], output_template => 'Current server SSL connections : %s', perfdatas => [ - { label => 'ServerSSL', value => 'server_ssl_absolute', template => '%s', - min => 0, unit => 'con' }, + { label => 'ServerSSL', template => '%s', min => 0, unit => 'con' }, ], } }, diff --git a/network/f5/bigip/snmp/mode/nodestatus.pm b/network/f5/bigip/snmp/mode/nodestatus.pm index ecbd38ab2..f79aa0910 100644 --- a/network/f5/bigip/snmp/mode/nodestatus.pm +++ b/network/f5/bigip/snmp/mode/nodestatus.pm @@ -57,8 +57,8 @@ sub set_counters { key_values => [ { name => 'ltmNodeAddrStatServerCurConns' }, { name => 'display' } ], output_template => 'current server connections : %s', perfdatas => [ - { label => 'current_server_connections', value => 'ltmNodeAddrStatServerCurConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_server_connections', value => 'ltmNodeAddrStatServerCurConns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/f5/bigip/snmp/mode/poolstatus.pm b/network/f5/bigip/snmp/mode/poolstatus.pm index 0c7580856..cdbca22bd 100644 --- a/network/f5/bigip/snmp/mode/poolstatus.pm +++ b/network/f5/bigip/snmp/mode/poolstatus.pm @@ -58,8 +58,8 @@ sub set_counters { key_values => [ { name => 'ltmPoolStatServerCurConns' }, { name => 'display' } ], output_template => 'current server connections: %s', perfdatas => [ - { label => 'current_server_connections', value => 'ltmPoolStatServerCurConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_server_connections', value => 'ltmPoolStatServerCurConns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'ltmPoolActiveMemberCnt' }, { name => 'display' } ], output_template => 'current active members: %s', perfdatas => [ - { label => 'current_active_members', value => 'ltmPoolActiveMemberCnt_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_active_members', value => 'ltmPoolActiveMemberCnt', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -76,8 +76,8 @@ sub set_counters { key_values => [ { name => 'ltmPoolMemberCnt' }, { name => 'display' } ], output_template => 'current total members: %s', perfdatas => [ - { label => 'current_total_members', value => 'ltmPoolMemberCnt_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_total_members', value => 'ltmPoolMemberCnt', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/f5/bigip/snmp/mode/tmmusage.pm b/network/f5/bigip/snmp/mode/tmmusage.pm index 6d735f9b1..a965d06a2 100644 --- a/network/f5/bigip/snmp/mode/tmmusage.pm +++ b/network/f5/bigip/snmp/mode/tmmusage.pm @@ -93,8 +93,8 @@ sub set_counters { key_values => [ { name => 'sysTmmStatTmUsageRatio1m' }, { name => 'display' } ], output_template => 'CPU Usage 1min : %s %%', output_error_template => "CPU Usage 1min : %s", perfdatas => [ - { label => 'cpu_1m', value => 'sysTmmStatTmUsageRatio1m_absolute', template => '%s', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_1m', value => 'sysTmmStatTmUsageRatio1m', template => '%s', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -102,8 +102,8 @@ sub set_counters { key_values => [ { name => 'sysTmmStatTmUsageRatio5m' }, { name => 'display' } ], output_template => 'CPU Usage 5min : %s %%', output_error_template => "CPU Usage 5min : %s", perfdatas => [ - { label => 'cpu_5m', value => 'sysTmmStatTmUsageRatio5m_absolute', template => '%s', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu_5m', value => 'sysTmmStatTmUsageRatio5m', template => '%s', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -111,8 +111,8 @@ sub set_counters { key_values => [ { name => 'sysTmmStatClientCurConns' }, { name => 'display' } ], output_template => 'Current Client Connections : %s', output_error_template => "Current Client Connections : %s", perfdatas => [ - { label => 'current_client_connections', value => 'sysTmmStatClientCurConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_client_connections', value => 'sysTmmStatClientCurConns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -120,8 +120,8 @@ sub set_counters { key_values => [ { name => 'sysTmmStatClientTotConns', diff => 1 }, { name => 'display' } ], output_template => 'Total Client Connections : %s', output_error_template => "Total Client Connections : %s", perfdatas => [ - { label => 'total_client_connections', value => 'sysTmmStatClientTotConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_client_connections', value => 'sysTmmStatClientTotConns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -129,8 +129,8 @@ sub set_counters { key_values => [ { name => 'sysTmmStatServerCurConns' }, { name => 'display' } ], output_template => 'Current Server Connections : %s', output_error_template => "Current Server Connections : %s", perfdatas => [ - { label => 'current_server_connections', value => 'sysTmmStatServerCurConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_server_connections', value => 'sysTmmStatServerCurConns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -138,8 +138,8 @@ sub set_counters { key_values => [ { name => 'sysTmmStatServerTotConns', diff => 1 }, { name => 'display' } ], output_template => 'Total Server Connections : %s', output_error_template => "Total Server Connections : %s", perfdatas => [ - { label => 'total_server_connections', value => 'sysTmmStatServerTotConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_server_connections', value => 'sysTmmStatServerTotConns', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/f5/bigip/snmp/mode/trunks.pm b/network/f5/bigip/snmp/mode/trunks.pm index 44adeddf9..40dc1777e 100644 --- a/network/f5/bigip/snmp/mode/trunks.pm +++ b/network/f5/bigip/snmp/mode/trunks.pm @@ -229,25 +229,25 @@ sub set_counters { output_template => "status is '%s'", output_error_template => 'Status : %s', output_use => 'sysTrunkStatus', closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => $self->can('custom_threshold_output'), + closure_custom_threshold_check => $self->can('custom_threshold_output') } }, { label => 'traffic-in', set => { key_values => [ { name => 'sysTrunkStatBytesIn', diff => 1 }, { name => 'sysTrunkOperBw', diff => 1 }, { name => 'display' } ], - closure_custom_calc => $self->can('custom_traffic_calc'), per_second => 1, + closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'sysTrunkStatBytesIn', speed => 'sysTrunkOperBw', label => 'in' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic In : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), - closure_custom_threshold_check => $self->can('custom_traffic_threshold'), + closure_custom_threshold_check => $self->can('custom_traffic_threshold') } }, { label => 'traffic-out', set => { key_values => [ { name => 'sysTrunkStatBytesOut', diff => 1 }, { name => 'sysTrunkOperBw', diff => 1 }, { name => 'display' } ], - closure_custom_calc => $self->can('custom_traffic_calc'), per_second => 1, + closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'sysTrunkStatBytesOut', speed => 'sysTrunkOperBw', label => 'out' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic Out : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), - closure_custom_threshold_check => $self->can('custom_traffic_threshold'), + closure_custom_threshold_check => $self->can('custom_traffic_threshold') } }, { label => 'packets-error-in', set => { @@ -256,7 +256,7 @@ sub set_counters { closure_custom_calc_extra_options => { errors => 'sysTrunkStatErrorsIn', packets => 'sysTrunkStatPktsIn', label => 'in' }, closure_custom_output => $self->can('custom_errors_output'), output_error_template => 'Packets In Error : %s', closure_custom_perfdata => $self->can('custom_errors_perfdata'), - closure_custom_threshold_check => $self->can('custom_errors_threshold'), + closure_custom_threshold_check => $self->can('custom_errors_threshold') } }, { label => 'packets-error-out', set => { @@ -265,7 +265,7 @@ sub set_counters { closure_custom_calc_extra_options => { errors => 'sysTrunkStatErrorsOut', packets => 'sysTrunkStatPktsOut', label => 'out' }, closure_custom_output => $self->can('custom_errors_output'), output_error_template => 'Packets Out Error : %s', closure_custom_perfdata => $self->can('custom_errors_perfdata'), - closure_custom_threshold_check => $self->can('custom_errors_threshold'), + closure_custom_threshold_check => $self->can('custom_errors_threshold') } }, { label => 'packets-drop-in', set => { @@ -274,7 +274,7 @@ sub set_counters { closure_custom_calc_extra_options => { drops => 'sysTrunkStatDropsIn', packets => 'sysTrunkStatPktsIn', label => 'in' }, closure_custom_output => $self->can('custom_drops_output'), output_error_template => 'Packets In Drop : %s', closure_custom_perfdata => $self->can('custom_drops_perfdata'), - closure_custom_threshold_check => $self->can('custom_drops_threshold'), + closure_custom_threshold_check => $self->can('custom_drops_threshold') } }, { label => 'packets-drop-out', set => { @@ -283,9 +283,9 @@ sub set_counters { closure_custom_calc_extra_options => { drops => 'sysTrunkStatDropsOut', packets => 'sysTrunkStatPktsOut', label => 'out' }, closure_custom_output => $self->can('custom_drops_output'), output_error_template => 'Packets Out Drop : %s', closure_custom_perfdata => $self->can('custom_drops_perfdata'), - closure_custom_threshold_check => $self->can('custom_drops_threshold'), + closure_custom_threshold_check => $self->can('custom_drops_threshold') } - }, + } ]; } diff --git a/network/freebox/restapi/mode/dslusage.pm b/network/freebox/restapi/mode/dslusage.pm index 42d6ea608..9fdcd4628 100644 --- a/network/freebox/restapi/mode/dslusage.pm +++ b/network/freebox/restapi/mode/dslusage.pm @@ -38,7 +38,7 @@ sub set_counters { output_template => 'Dsl available upload bandwidth : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'rate_up', value => 'rate_up_absolute', template => '%s', + { label => 'rate_up', value => 'rate_up', template => '%s', unit => 'b/s', min => 0 } ] } @@ -48,7 +48,7 @@ sub set_counters { output_template => 'Dsl available download bandwidth : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'rate_down', value => 'rate_down_absolute', template => '%s', + { label => 'rate_down', value => 'rate_down', template => '%s', unit => 'b/s', min => 0 } ] } @@ -58,7 +58,7 @@ sub set_counters { output_template => 'Dsl upload signal/noise ratio : %.2f dB', output_change_bytes => 2, perfdatas => [ - { label => 'snr_up', value => 'snr_up_absolute', template => '%.2f', + { label => 'snr_up', value => 'snr_up', template => '%.2f', unit => 'dB' } ] } @@ -68,7 +68,7 @@ sub set_counters { output_template => 'Dsl download signal/noise ratio : %.2f dB', output_change_bytes => 2, perfdatas => [ - { label => 'snr_down', value => 'snr_down_absolute', template => '%.2f', + { label => 'snr_down', value => 'snr_down', template => '%.2f', unit => 'dB' } ] } diff --git a/network/freebox/restapi/mode/netusage.pm b/network/freebox/restapi/mode/netusage.pm index f0bc001ad..90d233a5d 100644 --- a/network/freebox/restapi/mode/netusage.pm +++ b/network/freebox/restapi/mode/netusage.pm @@ -38,7 +38,7 @@ sub set_counters { output_template => 'Upload available bandwidth : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'bw_up', value => 'bw_up_absolute', template => '%s', + { label => 'bw_up', value => 'bw_up', template => '%s', unit => 'b/s', min => 0 } ] } @@ -48,7 +48,7 @@ sub set_counters { output_template => 'Download available bandwidth : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'bw_down', value => 'bw_down_absolute', template => '%s', + { label => 'bw_down', value => 'bw_down', template => '%s', unit => 'b/s', min => 0 } ] } @@ -58,7 +58,7 @@ sub set_counters { output_template => 'Upload rate : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'rate_up', value => 'rate_up_absolute', template => '%s', + { label => 'rate_up', value => 'rate_up', template => '%s', unit => 'b/s', min => 0 } ] } @@ -68,7 +68,7 @@ sub set_counters { output_template => 'Download rate : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'rate_down', value => 'rate_down_absolute', template => '%s', + { label => 'rate_down', value => 'rate_down', template => '%s', unit => 'b/s', min => 0 } ] } @@ -78,7 +78,7 @@ sub set_counters { output_template => 'Vpn client upload rate : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'vpn_rate_up', value => 'vpn_rate_up_absolute', template => '%s', + { label => 'vpn_rate_up', value => 'vpn_rate_up', template => '%s', unit => 'b/s', min => 0 } ] } @@ -88,7 +88,7 @@ sub set_counters { output_template => 'Vpn client download rate : %.2f %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'vpn_rate_down', value => 'vpn_rate_down_absolute', template => '%s', + { label => 'vpn_rate_down', value => 'vpn_rate_down', template => '%s', unit => 'b/s', min => 0 } ] } diff --git a/network/freebox/restapi/mode/system.pm b/network/freebox/restapi/mode/system.pm index a57c43ee1..4cdfe5127 100644 --- a/network/freebox/restapi/mode/system.pm +++ b/network/freebox/restapi/mode/system.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'temp_cpum' } ], output_template => 'Temperature cpum : %s C', perfdatas => [ - { label => 'temp_cpum', value => 'temp_cpum_absolute', template => '%s', + { label => 'temp_cpum', value => 'temp_cpum', template => '%s', unit => 'C' } ] } @@ -48,7 +48,7 @@ sub set_counters { key_values => [ { name => 'temp_cpub' } ], output_template => 'Temperature cpub : %s C', perfdatas => [ - { label => 'temp_cpub', value => 'temp_cpub_absolute', template => '%s', + { label => 'temp_cpub', value => 'temp_cpub', template => '%s', unit => 'C' } ] } @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'temp_sw' } ], output_template => 'Temperature switch : %s C', perfdatas => [ - { label => 'temp_sw', value => 'temp_sw_absolute', template => '%s', + { label => 'temp_sw', value => 'temp_sw', template => '%s', unit => 'C' } ] } @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'fan_rpm' } ], output_template => 'fan speed : %s rpm', perfdatas => [ - { label => 'fan_rpm', value => 'fan_rpm_absolute', template => '%s', + { label => 'fan_rpm', value => 'fan_rpm', template => '%s', min => 0, unit => 'rpm' } ] } diff --git a/network/fritzbox/mode/traffic.pm b/network/fritzbox/mode/traffic.pm index d07f535e7..18d9ad7a8 100644 --- a/network/fritzbox/mode/traffic.pm +++ b/network/fritzbox/mode/traffic.pm @@ -131,28 +131,28 @@ sub run { # At least one second. two fast calls ;) $time_delta = 1; } - my $in_absolute_per_sec = ($new_datas->{in} - $old_in) / $time_delta; - my $out_absolute_per_sec = ($new_datas->{out} - $old_out) / $time_delta; + my $in_per_sec = ($new_datas->{in} - $old_in) / $time_delta; + my $out_per_sec = ($new_datas->{out} - $old_out) / $time_delta; my ($exit, $in_prct, $out_prct); - $in_prct = $in_absolute_per_sec * 100 / $NewLayer1DownstreamMaxBitRate; - $out_prct = $out_absolute_per_sec * 100 / $NewLayer1UpstreamMaxBitRate; + $in_prct = $in_per_sec * 100 / $NewLayer1DownstreamMaxBitRate; + $out_prct = $out_per_sec * 100 / $NewLayer1UpstreamMaxBitRate; if ($self->{option_results}->{units} eq '%') { my $exit1 = $self->{perfdata}->threshold_check(value => $in_prct, threshold => [ { label => 'critical-in', 'exit_litteral' => 'critical' }, { label => 'warning-in', exit_litteral => 'warning' } ]); my $exit2 = $self->{perfdata}->threshold_check(value => $out_prct, threshold => [ { label => 'critical-out', 'exit_litteral' => 'critical' }, { label => 'warning-out', exit_litteral => 'warning' } ]); $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2 ]); } else { - my $exit1 = $self->{perfdata}->threshold_check(value => $in_absolute_per_sec, threshold => [ { label => 'critical-in', 'exit_litteral' => 'critical' }, { label => 'warning-in', exit_litteral => 'warning' } ]); - my $exit2 = $self->{perfdata}->threshold_check(value => $out_absolute_per_sec, threshold => [ { label => 'critical-out', 'exit_litteral' => 'critical' }, { label => 'warning-out', exit_litteral => 'warning' } ]); + my $exit1 = $self->{perfdata}->threshold_check(value => $in_per_sec, threshold => [ { label => 'critical-in', 'exit_litteral' => 'critical' }, { label => 'warning-in', exit_litteral => 'warning' } ]); + my $exit2 = $self->{perfdata}->threshold_check(value => $out_per_sec, threshold => [ { label => 'critical-out', 'exit_litteral' => 'critical' }, { label => 'warning-out', exit_litteral => 'warning' } ]); $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2 ]); } $in_prct = sprintf("%.2f", $in_prct); $out_prct = sprintf("%.2f", $out_prct); ### Manage Output - my ($in_value, $in_unit) = $self->{perfdata}->change_bytes(value => $in_absolute_per_sec, network => 1); - my ($out_value, $out_unit) = $self->{perfdata}->change_bytes(value => $out_absolute_per_sec, network => 1); + my ($in_value, $in_unit) = $self->{perfdata}->change_bytes(value => $in_per_sec, network => 1); + my ($out_value, $out_unit) = $self->{perfdata}->change_bytes(value => $out_per_sec, network => 1); $self->{output}->output_add(short_msg => sprintf("Traffic In : %s/s (%s %%), Out : %s/s (%s %%)", $in_value . $in_unit, $in_prct, $out_value . $out_unit, $out_prct)); @@ -165,13 +165,13 @@ sub run { $self->{output}->perfdata_add(label => 'traffic_in', unit => 'b/s', - value => sprintf("%.2f", $in_absolute_per_sec), + value => sprintf("%.2f", $in_per_sec), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-in', total => $NewLayer1DownstreamMaxBitRate), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-in', total => $NewLayer1DownstreamMaxBitRate), min => 0, max => $NewLayer1DownstreamMaxBitRate); $self->{output}->perfdata_add(label => 'traffic_out', unit => 'b/s', - value => sprintf("%.2f", $out_absolute_per_sec), + value => sprintf("%.2f", $out_per_sec), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-out', total => $NewLayer1UpstreamMaxBitRate), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-out', total => $NewLayer1UpstreamMaxBitRate), min => 0, max => $NewLayer1UpstreamMaxBitRate); diff --git a/network/hp/procurve/snmp/mode/virtualchassis.pm b/network/hp/procurve/snmp/mode/virtualchassis.pm index 8e9927158..bcc8269a8 100644 --- a/network/hp/procurve/snmp/mode/virtualchassis.pm +++ b/network/hp/procurve/snmp/mode/virtualchassis.pm @@ -73,13 +73,13 @@ sub custom_link_status_output { sub custom_memory_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); my $msg = sprintf("memory usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)", $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free} ); return $msg; } @@ -110,7 +110,7 @@ sub set_counters { key_values => [ { name => 'members'} ], output_template => 'total members: %s', perfdatas => [ - { value => 'members_absolute', template => '%s', min => 0 }, + { value => 'members', template => '%s', min => 0 }, ], } }, @@ -129,7 +129,7 @@ sub set_counters { key_values => [ { name => 'cpu'}, { name => 'display'} ], output_template => 'cpu usage: %.2f%%', perfdatas => [ - { value => 'cpu_absolute', template => '%.2f', unit => '%', min => 0, max => 100, + { value => 'cpu', template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1 }, ], } @@ -138,7 +138,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_memory_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1 }, ], } @@ -147,7 +147,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_memory_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1 }, ], } @@ -156,7 +156,7 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'memory used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ], } diff --git a/network/huawei/snmp/mode/cpu.pm b/network/huawei/snmp/mode/cpu.pm index b2b952a45..7ce136b42 100644 --- a/network/huawei/snmp/mode/cpu.pm +++ b/network/huawei/snmp/mode/cpu.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'num' }, ], output_template => 'Usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num_absolute' }, + { label => 'cpu', value => 'cpu', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'num' }, ], } }, diff --git a/network/infoblox/snmp/mode/cpu.pm b/network/infoblox/snmp/mode/cpu.pm index 174c8a595..738c368f1 100644 --- a/network/infoblox/snmp/mode/cpu.pm +++ b/network/infoblox/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu' } ], output_template => 'CPU Usage : %.2f %%', perfdatas => [ - { label => 'cpu_usage', value => 'cpu_absolute', template => '%.2f', + { label => 'cpu_usage', value => 'cpu', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/infoblox/snmp/mode/dhcpusage.pm b/network/infoblox/snmp/mode/dhcpusage.pm index a76f72187..90f162f56 100644 --- a/network/infoblox/snmp/mode/dhcpusage.pm +++ b/network/infoblox/snmp/mode/dhcpusage.pm @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => $map[$i]->[0], diff => 1 } ], output_template => $map[$i]->[1], perfdatas => [ - { label => $perf_label, value => $map[$i]->[0] . '_absolute', template => '%s', min => 0 }, + { label => $perf_label, value => $map[$i]->[0] , template => '%s', min => 0 }, ], } }; @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'ibDHCPSubnetPercentUsed' }, { name => 'display' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { label => 'subnet_used', value => 'iibDHCPSubnetPercentUsed_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'subnet_used', value => 'iibDHCPSubnetPercentUsed', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/infoblox/snmp/mode/dnsusage.pm b/network/infoblox/snmp/mode/dnsusage.pm index 548d86506..929ad1e4e 100644 --- a/network/infoblox/snmp/mode/dnsusage.pm +++ b/network/infoblox/snmp/mode/dnsusage.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'ibDnsQueryRate' } ], output_template => 'Total query rate : %s', perfdatas => [ - { label => 'total_query_rate', value => 'ibDnsQueryRate_absolute', template => '%s', + { label => 'total_query_rate', value => 'ibDnsQueryRate', template => '%s', min => 0 }, ], } @@ -48,7 +48,7 @@ sub set_counters { key_values => [ { name => 'ibDnsHitRatio' } ], output_template => 'Total hit ratio : %.2f %%', perfdatas => [ - { label => 'total_hit_ratio', value => 'ibDnsHitRatio_absolute', template => '%.2f', + { label => 'total_hit_ratio', value => 'ibDnsHitRatio', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -60,8 +60,8 @@ sub set_counters { key_values => [ { name => 'ibBindZoneSuccess', diff => 1 }, { name => 'display' } ], output_template => 'Success responses : %s', perfdatas => [ - { label => 'success_count', value => 'ibBindZoneSuccess_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'success_count', value => 'ibBindZoneSuccess', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -69,8 +69,8 @@ sub set_counters { key_values => [ { name => 'ibBindZoneReferral', diff => 1 }, { name => 'display' } ], output_template => 'Referrals : %s', perfdatas => [ - { label => 'referral_count', value => 'ibBindZoneReferral_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'referral_count', value => 'ibBindZoneReferral', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -78,8 +78,8 @@ sub set_counters { key_values => [ { name => 'ibBindZoneNxRRset', diff => 1 }, { name => 'display' } ], output_template => 'Non-existent record : %s', perfdatas => [ - { label => 'nxrrset_count', value => 'ibBindZoneNxRRset_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'nxrrset_count', value => 'ibBindZoneNxRRset', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -87,8 +87,8 @@ sub set_counters { key_values => [ { name => 'ibBindZoneFailure', diff => 1 }, { name => 'display' } ], output_template => 'Failed queries : %s', perfdatas => [ - { label => 'failure_count', value => 'ibBindZoneFailure_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'failure_count', value => 'ibBindZoneFailure', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/infoblox/snmp/mode/memory.pm b/network/infoblox/snmp/mode/memory.pm index 813026caf..2c10ad45a 100644 --- a/network/infoblox/snmp/mode/memory.pm +++ b/network/infoblox/snmp/mode/memory.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'ram_used' } ], output_template => 'Memory Used: %.2f%%', perfdatas => [ - { label => 'memory_used', value => 'ram_used_absolute', template => '%.2f', + { label => 'memory_used', value => 'ram_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'swap_used' } ], output_template => 'Swap Used: %.2f%%', perfdatas => [ - { label => 'swap_used', value => 'swap_used_absolute', template => '%.2f', + { label => 'swap_used', value => 'swap_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/juniper/common/ive/mode/users.pm b/network/juniper/common/ive/mode/users.pm index 5c7ee4f93..a132a3186 100644 --- a/network/juniper/common/ive/mode/users.pm +++ b/network/juniper/common/ive/mode/users.pm @@ -28,19 +28,19 @@ use warnings; sub custom_node_output { my ($self, %options) = @_; - if ($self->{result_values}->{node_total_absolute} ne '') { + if ($self->{result_values}->{node_total} ne '') { return sprintf( 'concurrent users licenses usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', - $self->{result_values}->{node_total_absolute}, - $self->{result_values}->{node_used_absolute}, - $self->{result_values}->{node_used_absolute} * 100 / $self->{result_values}->{node_total_absolute}, - $self->{result_values}->{node_total_absolute} - $self->{result_values}->{node_used_absolute}, - ($self->{result_values}->{node_total_absolute} - $self->{result_values}->{node_used_absolute}) * 100 / $self->{result_values}->{node_total_absolute} + $self->{result_values}->{node_total}, + $self->{result_values}->{node_used}, + $self->{result_values}->{node_used} * 100 / $self->{result_values}->{node_total}, + $self->{result_values}->{node_total} - $self->{result_values}->{node_used}, + ($self->{result_values}->{node_total} - $self->{result_values}->{node_used}) * 100 / $self->{result_values}->{node_total} ); } else { return sprintf( 'concurrent users licenses used: %s', - $self->{result_values}->{node_used_absolute} + $self->{result_values}->{node_used} ); } } @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'node_used' }, { name => 'node_total' } ], closure_custom_output => $self->can('custom_node_output'), perfdatas => [ - { value => 'node_used_absolute', template => '%d', min => 0, max => 'node_total_absolute' }, + { value => 'node_used', template => '%d', min => 0, max => 'node_total' }, ], } }, @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'node_free' }, { name => 'node_used' }, { name => 'node_total' } ], closure_custom_output => $self->can('custom_node_output'), perfdatas => [ - { value => 'node_free_absolute', template => '%d', min => 0, max => 'node_total_absolute' }, + { value => 'node_free', template => '%d', min => 0, max => 'node_total' }, ], } }, @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => 'prct_node_used' } ], output_template => 'concurrent users licenses used: %.2f %%', perfdatas => [ - { value => 'prct_node_used_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_node_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => 'web' } ], output_template => 'current concurrent signed-in web users connections: %s', perfdatas => [ - { value => 'web_absolute', template => '%s', min => 0 }, + { value => 'web', template => '%s', min => 0 }, ], } }, @@ -90,7 +90,7 @@ sub set_counters { key_values => [ { name => 'meeting' } ], output_template => 'current concurrent meeting users connections: %s', perfdatas => [ - { value => 'meeting_absolute', template => '%s', min => 0 }, + { value => 'meeting', template => '%s', min => 0 }, ], } }, @@ -98,7 +98,7 @@ sub set_counters { key_values => [ { name => 'cluster' } ], output_template => 'current concurrent cluster logged users connections: %s', perfdatas => [ - { value => 'cluster_absolute', template => '%s', min => 0 }, + { value => 'cluster', template => '%s', min => 0 }, ], } } diff --git a/network/juniper/common/junos/mode/bgppeerprefixstatistics.pm b/network/juniper/common/junos/mode/bgppeerprefixstatistics.pm index f77c02239..66bf406dc 100644 --- a/network/juniper/common/junos/mode/bgppeerprefixstatistics.pm +++ b/network/juniper/common/junos/mode/bgppeerprefixstatistics.pm @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'jnxBgpM2PrefixInPrefixes' }, { name => 'jnxBgpM2PrefixCountersAfiSafi' } ], output_template => 'Prefixes In: %d', perfdatas => [ - { value => 'jnxBgpM2PrefixInPrefixes_absolute', template => '%d', + { value => 'jnxBgpM2PrefixInPrefixes', template => '%d', label_extra_instance => 1 }, ], } @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'jnxBgpM2PrefixInPrefixesAccepted' }, { name => 'jnxBgpM2PrefixCountersAfiSafi' } ], output_template => 'Prefixes In Accepted: %d', perfdatas => [ - { value => 'jnxBgpM2PrefixInPrefixesAccepted_absolute', template => '%d', + { value => 'jnxBgpM2PrefixInPrefixesAccepted', template => '%d', label_extra_instance => 1 }, ], } @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'jnxBgpM2PrefixInPrefixesRejected' }, { name => 'jnxBgpM2PrefixCountersAfiSafi' } ], output_template => 'Prefixes In Rejected: %d', perfdatas => [ - { value => 'jnxBgpM2PrefixInPrefixesRejected_absolute', template => '%d', + { value => 'jnxBgpM2PrefixInPrefixesRejected', template => '%d', label_extra_instance => 1 }, ], } @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'jnxBgpM2PrefixInPrefixesActive' }, { name => 'jnxBgpM2PrefixCountersAfiSafi' } ], output_template => 'Prefixes In Active: %d', perfdatas => [ - { value => 'jnxBgpM2PrefixInPrefixesActive_absolute', template => '%d', + { value => 'jnxBgpM2PrefixInPrefixesActive', template => '%d', label_extra_instance => 1 }, ], } @@ -80,7 +80,7 @@ sub set_counters { key_values => [ { name => 'jnxBgpM2PrefixOutPrefixes' }, { name => 'jnxBgpM2PrefixCountersAfiSafi' } ], output_template => 'Prefixes Out: %d', perfdatas => [ - { value => 'jnxBgpM2PrefixOutPrefixes_absolute', template => '%d', + { value => 'jnxBgpM2PrefixOutPrefixes', template => '%d', label_extra_instance => 1 }, ], } diff --git a/network/juniper/common/junos/mode/cpu.pm b/network/juniper/common/junos/mode/cpu.pm index 7a3f981de..1069be191 100644 --- a/network/juniper/common/junos/mode/cpu.pm +++ b/network/juniper/common/junos/mode/cpu.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'cpu_usage' }, { name => 'display' } ], output_template => 'average usage is: %.2f%%', perfdatas => [ - { label => 'cpu', value => 'cpu_usage_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'cpu_usage', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'cpu_load1' }, { name => 'display' } ], output_template => 'load 1min: %s', perfdatas => [ - { label => 'load1', value => 'cpu_load1_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load1', value => 'cpu_load1', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'cpu_load5' }, { name => 'display' } ], output_template => 'load 5min: %s', perfdatas => [ - { label => 'load5', value => 'cpu_load5_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load5', value => 'cpu_load5', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -64,8 +64,8 @@ sub set_counters { key_values => [ { name => 'cpu_load15' }, { name => 'display' } ], output_template => 'load 15min: %s', perfdatas => [ - { label => 'load15', value => 'cpu_load15_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'load15', value => 'cpu_load15', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/juniper/common/junos/mode/interfaces.pm b/network/juniper/common/junos/mode/interfaces.pm index 30e027430..2ef4fc297 100644 --- a/network/juniper/common/junos/mode/interfaces.pm +++ b/network/juniper/common/junos/mode/interfaces.pm @@ -57,8 +57,8 @@ sub set_counters { key_values => [ { name => 'input_power' }, { name => 'display' } ], output_template => 'Input Power : %s dBm', perfdatas => [ - { value => 'input_power_absolute', template => '%s', - unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'input_power', template => '%s', + unit => 'dBm', label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -66,8 +66,8 @@ sub set_counters { key_values => [ { name => 'bias_current' }, { name => 'display' } ], output_template => 'Bias Current : %s mA', perfdatas => [ - { value => 'bias_current_absolute', template => '%s', - unit => 'mA', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'bias_current', template => '%s', + unit => 'mA', label_extra_instance => 1, instance_use => 'display' }, ] } }, @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'output_power' }, { name => 'display' } ], output_template => 'Output Power : %s dBm', perfdatas => [ - { value => 'output_power_absolute', template => '%s', - unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'output_power', template => '%s', + unit => 'dBm', label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -84,8 +84,8 @@ sub set_counters { key_values => [ { name => 'module_temperature' }, { name => 'display' } ], output_template => 'Module Temperature : %.2f C', perfdatas => [ - { value => 'module_temperature_absolute', template => '%.2f', - unit => 'C', label_extra_instance => 1, instance_use => 'display_absolute' } + { value => 'module_temperature', template => '%.2f', + unit => 'C', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/network/juniper/common/junos/mode/ipsectunnel.pm b/network/juniper/common/junos/mode/ipsectunnel.pm index 25cfb05ad..c07c5130c 100644 --- a/network/juniper/common/junos/mode/ipsectunnel.pm +++ b/network/juniper/common/junos/mode/ipsectunnel.pm @@ -47,12 +47,12 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Tunnels: %s', perfdatas => [ - { label => 'total_tunnels', value => 'total_absolute', template => '%s', - min => 0 }, - ], + { label => 'total_tunnels', template => '%s', min => 0 } + ] } - }, + } ]; + $self->{maps_counters}->{tunnel} = [ { label => 'status', threshold => 0, set => { key_values => [ { name => 'ike_state' }, { name => 'display' } ], @@ -64,7 +64,7 @@ sub set_counters { }, { label => 'tunnel-traffic-in', nlabel => 'ipsec.tunnel.traffic.in.bitspersecond', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_traffic_output'), threshold_use => 'traffic_per_second', @@ -76,7 +76,7 @@ sub set_counters { }, { label => 'tunnel-traffic-out', nlabel => 'ipsec.tunnel.traffic.out.bitspersecond', set => { key_values => [], - per_second => 1, manual_keys => 1, + manual_keys => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_traffic_output'), threshold_use => 'traffic_per_second', @@ -85,7 +85,7 @@ sub set_counters { min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } - }, + } ]; } diff --git a/network/juniper/common/junos/mode/ldpsessionstatus.pm b/network/juniper/common/junos/mode/ldpsessionstatus.pm index e7cac7055..f0a302362 100644 --- a/network/juniper/common/junos/mode/ldpsessionstatus.pm +++ b/network/juniper/common/junos/mode/ldpsessionstatus.pm @@ -68,8 +68,8 @@ sub set_counters { { name => 'label' } ], output_template => 'Last change: %s', perfdatas => [ - { label => 'last_change', value => 'jnxMplsLdpSesStateLastChange_absolute', template => '%d', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'label_absolute' }, + { label => 'last_change', value => 'jnxMplsLdpSesStateLastChange', template => '%d', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'label' }, ], } }, diff --git a/network/juniper/common/junos/mode/lspstatus.pm b/network/juniper/common/junos/mode/lspstatus.pm index 5d85325b2..c76b159bc 100644 --- a/network/juniper/common/junos/mode/lspstatus.pm +++ b/network/juniper/common/junos/mode/lspstatus.pm @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'mplsLspInfoTransitions' }, { name => 'mplsLspName' } ], output_template => 'Transition count: %d', perfdatas => [ - { label => 'transition_count', value => 'mplsLspInfoTransitions_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'mplsLspName_absolute' }, + { label => 'transition_count', value => 'mplsLspInfoTransitions', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'mplsLspName' }, ], } }, @@ -77,8 +77,8 @@ sub set_counters { { name => 'mplsLspName' } ], output_template => 'Last transition: %s', perfdatas => [ - { label => 'last_transition', value => 'mplsLspInfoLastTransition_absolute', template => '%d', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'mplsLspName_absolute' }, + { label => 'last_transition', value => 'mplsLspInfoLastTransition', template => '%d', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'mplsLspName' }, ], } }, diff --git a/network/juniper/common/junos/mode/memory.pm b/network/juniper/common/junos/mode/memory.pm index 40c39886e..7229c1f40 100644 --- a/network/juniper/common/junos/mode/memory.pm +++ b/network/juniper/common/junos/mode/memory.pm @@ -29,11 +29,11 @@ sub custom_mem_output { my ($self, %options) = @_; return sprintf("Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -49,8 +49,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_mem_output'), perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -58,8 +58,8 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_mem_output'), perfdatas => [ - { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'free', value => 'free', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/juniper/common/screenos/snmp/mode/nsrp.pm b/network/juniper/common/screenos/snmp/mode/nsrp.pm index b79d3d0ce..b6404e379 100644 --- a/network/juniper/common/screenos/snmp/mode/nsrp.pm +++ b/network/juniper/common/screenos/snmp/mode/nsrp.pm @@ -65,7 +65,7 @@ sub set_counters { key_values => [ { name => 'nsrpVsdGroupCntStateChange', diff => 1 } ], output_template => 'number of state transition events: %s', perfdatas => [ - { value => 'nsrpVsdGroupCntStateChange_absolute', template => '%s', + { value => 'nsrpVsdGroupCntStateChange', template => '%s', min => 0, label_extra_instance => 1 }, ], } diff --git a/network/juniper/common/screenos/snmp/mode/sessions.pm b/network/juniper/common/screenos/snmp/mode/sessions.pm index 64a5e03cd..b51bc58ba 100644 --- a/network/juniper/common/screenos/snmp/mode/sessions.pm +++ b/network/juniper/common/screenos/snmp/mode/sessions.pm @@ -37,42 +37,40 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'total' }, { name => 'used' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'sessions', value => 'used_absolute', template => '%s', - min => 0, max => 'total_absolute', threshold_total => 'total_absolute', cast_int => 1 }, + { label => 'sessions', value => 'used', template => '%s', + min => 0, max => 'total', threshold_total => 'total', cast_int => 1 }, ], } }, { label => 'failed', set => { - key_values => [ { name => 'failed', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'failed', per_second => 1 } ], output_template => 'Failed sessions : %.2f/s', output_error_template => "Failed sessions : %s", perfdatas => [ - { label => 'sessions_failed', value => 'failed_per_second', template => '%.2f', unit => '/s', - min => 0 }, + { label => 'sessions_failed', template => '%.2f', unit => '/s', min => 0 }, ], } - }, + } ]; } sub custom_usage_output { my ($self, %options) = @_; - my $msg = sprintf("%.2f%% of the sessions limit reached (%d of max. %d)", - $self->{result_values}->{prct_used_absolute}, - $self->{result_values}->{used_absolute}, - $self->{result_values}->{total_absolute}); - return $msg; + return sprintf( + "%.2f%% of the sessions limit reached (%d of max. %d)", + $self->{result_values}->{prct_used}, + $self->{result_values}->{used}, + $self->{result_values}->{total} + ); } sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); + + $options{options}->add_options(arguments => { + }); return $self; } @@ -85,12 +83,13 @@ sub manage_selection { my $oid_nsResSessFailed = '.1.3.6.1.4.1.3224.16.3.4.0'; my $result = $options{snmp}->get_leef(oids => [$oid_nsResSessAllocate, $oid_nsResSessMaxium, $oid_nsResSessFailed], nothing_quit => 1); - $self->{global} = { total => $result->{$oid_nsResSessMaxium}, - used => $result->{$oid_nsResSessAllocate}, - failed => $result->{$oid_nsResSessFailed}, - prct_used => $result->{$oid_nsResSessAllocate} * 100 / $result->{$oid_nsResSessMaxium}, - }; - + $self->{global} = { + total => $result->{$oid_nsResSessMaxium}, + used => $result->{$oid_nsResSessAllocate}, + failed => $result->{$oid_nsResSessFailed}, + prct_used => $result->{$oid_nsResSessAllocate} * 100 / $result->{$oid_nsResSessMaxium}, + }; + $self->{cache_name} = "juniper_" . $options{snmp}->get_hostname() . '_' . $options{snmp}->get_port() . '_' . $self->{mode} . '_' . (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')); } diff --git a/network/juniper/common/screenos/snmp/mode/vpnstatus.pm b/network/juniper/common/screenos/snmp/mode/vpnstatus.pm index 8ece4c35d..3aee38850 100644 --- a/network/juniper/common/screenos/snmp/mode/vpnstatus.pm +++ b/network/juniper/common/screenos/snmp/mode/vpnstatus.pm @@ -46,7 +46,7 @@ sub custom_update_output { my ($self, %options) = @_; my $msg = sprintf("Update time: %s", - $self->{result_values}->{update_time_absolute} != 0 ? centreon::plugins::misc::change_seconds(value => $self->{result_values}->{update_time_absolute}) : 0); + $self->{result_values}->{update_time} != 0 ? centreon::plugins::misc::change_seconds(value => $self->{result_values}->{update_time}) : 0); return $msg; } @@ -76,8 +76,8 @@ sub set_counters { key_values => [ { name => 'update_time'}, { name => 'display' } ], closure_custom_output => $self->can('custom_update_output'), perfdatas => [ - { label => 'update_time', value => 'update_time_absolute', template => '%d', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'update_time', value => 'update_time', template => '%d', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/juniper/common/screenos/snmp/mode/vpnusage.pm b/network/juniper/common/screenos/snmp/mode/vpnusage.pm index 6ab443f70..28d3c2297 100644 --- a/network/juniper/common/screenos/snmp/mode/vpnusage.pm +++ b/network/juniper/common/screenos/snmp/mode/vpnusage.pm @@ -41,25 +41,25 @@ sub set_counters { $self->{maps_counters}->{vpn} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_absolute', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%s', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_absolute', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%s', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } - }, + } ]; } @@ -68,11 +68,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); + return $self; } diff --git a/network/juniper/ggsn/mode/apnstats.pm b/network/juniper/ggsn/mode/apnstats.pm index 7b070ebaf..f244b998e 100644 --- a/network/juniper/ggsn/mode/apnstats.pm +++ b/network/juniper/ggsn/mode/apnstats.pm @@ -30,12 +30,12 @@ sub custom_drop_in_calc { my ($self, %options) = @_; $self->{result_values}->{ggsnApnName} = $options{new_datas}->{$self->{instance} . '_ggsnApnName'}; - $self->{result_values}->{ggsnApnUplinkDrops_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnApnUplinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnApnUplinkDrops'}; - $self->{result_values}->{ggsnApnUplinkPackets_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnApnUplinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnApnUplinkPackets'}; - if ($self->{result_values}->{ggsnApnUplinkPackets_absolute} == 0) { + $self->{result_values}->{ggsnApnUplinkDrops} = $options{new_datas}->{$self->{instance} . '_ggsnApnUplinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnApnUplinkDrops'}; + $self->{result_values}->{ggsnApnUplinkPackets} = $options{new_datas}->{$self->{instance} . '_ggsnApnUplinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnApnUplinkPackets'}; + if ($self->{result_values}->{ggsnApnUplinkPackets} == 0) { $self->{result_values}->{drop_prct} = 0; } else { - $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnApnUplinkDrops_absolute} * 100 / $self->{result_values}->{ggsnApnUplinkPackets_absolute}; + $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnApnUplinkDrops} * 100 / $self->{result_values}->{ggsnApnUplinkPackets}; } return 0; } @@ -44,12 +44,12 @@ sub custom_drop_out_calc { my ($self, %options) = @_; $self->{result_values}->{ggsnApnName} = $options{new_datas}->{$self->{instance} . '_ggsnApnName'}; - $self->{result_values}->{ggsnApnDownlinkDrops_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnApnDownlinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnApnDownlinkDrops'}; - $self->{result_values}->{ggsnApnDownlinkPackets_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnApnDownlinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnApnDownlinkPackets'}; - if ($self->{result_values}->{ggsnApnDownlinkPackets_absolute} == 0) { + $self->{result_values}->{ggsnApnDownlinkDrops} = $options{new_datas}->{$self->{instance} . '_ggsnApnDownlinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnApnDownlinkDrops'}; + $self->{result_values}->{ggsnApnDownlinkPackets} = $options{new_datas}->{$self->{instance} . '_ggsnApnDownlinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnApnDownlinkPackets'}; + if ($self->{result_values}->{ggsnApnDownlinkPackets} == 0) { $self->{result_values}->{drop_prct} = 0; } else { - $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnApnDownlinkDrops_absolute} * 100 / $self->{result_values}->{ggsnApnDownlinkPackets_absolute}; + $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnApnDownlinkDrops} * 100 / $self->{result_values}->{ggsnApnDownlinkPackets}; } return 0; } @@ -63,22 +63,22 @@ sub set_counters { $self->{maps_counters}->{apn} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'ggsnApnUplinkBytes', diff => 1 }, { name => 'ggsnApnName' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'ggsnApnUplinkBytes', per_second => 1 }, { name => 'ggsnApnName' } ], output_template => 'Traffic In : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'ggsnApnUplinkBytes_per_second', template => '%s', - unit => 'b/s', min => 0, label_extra_instance => 1, cast_int => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'traffic_in', template => '%s', + unit => 'b/s', min => 0, label_extra_instance => 1, cast_int => 1, instance_use => 'ggsnApnName' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'ggsnApnDownlinkBytes', diff => 1 }, { name => 'ggsnApnName' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'ggsnApnDownlinkBytes', per_second => 1 }, { name => 'ggsnApnName' } ], output_template => 'Traffic Out : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'ggsnApnDownlinkBytes_per_second', template => '%s', - unit => 'b/s', min => 0, label_extra_instance => 1, cast_int => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'traffic_out', template => '%s', + unit => 'b/s', min => 0, label_extra_instance => 1, cast_int => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -87,8 +87,8 @@ sub set_counters { output_template => 'Drop In Packets : %.2f %%', threshold_use => 'drop_prct', output_use => 'drop_prct', closure_custom_calc => $self->can('custom_drop_in_calc'), perfdatas => [ - { label => 'drop_in', value => 'ggsnApnUplinkDrops_absolute', template => '%s', - min => 0, max => 'ggsnApnUplinkPackets_absolute', label_extra_instance => 1, instance_use => 'ggsnApnName' }, + { label => 'drop_in', value => 'ggsnApnUplinkDrops', template => '%s', + min => 0, max => 'ggsnApnUplinkPackets', label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -97,8 +97,8 @@ sub set_counters { output_template => 'Drop Out Packets : %.2f %%', threshold_use => 'drop_prct', output_use => 'drop_prct', closure_custom_calc => $self->can('custom_drop_out_calc'), perfdatas => [ - { label => 'drop_out', value => 'ggsnApnDownlinkDrops_absolute', template => '%s', - min => 0, max => 'ggsnApnDownlinkPackets_absolute', label_extra_instance => 1, instance_use => 'ggsnApnName' }, + { label => 'drop_out', value => 'ggsnApnDownlinkDrops', template => '%s', + min => 0, max => 'ggsnApnDownlinkPackets', label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnActivePdpContextCount' }, { name => 'ggsnApnName' } ], output_template => 'Active Pdp : %s', perfdatas => [ - { label => 'active_pdp', value => 'ggsnApnActivePdpContextCount_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'active_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -114,7 +114,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnAttemptedActivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Attempted Activation Pdp : %s', perfdatas => [ - { label => 'attempted_activation_pdp', value => 'ggsnApnAttemptedActivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'attempted_activation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnAttemptedDynActivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Attempted Dyn Activation Pdp : %s', perfdatas => [ - { label => 'attempted_dyn_activation_pdp', value => 'ggsnApnAttemptedDynActivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'attempted_dyn_activation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -130,7 +130,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnAttemptedDeactivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Attempted Deactivation Pdp : %s', perfdatas => [ - { label => 'attempted_deactivation_pdp', value => 'ggsnApnAttemptedDeactivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'attempted_deactivation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -138,7 +138,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnAttemptedSelfDeactivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Attempted Self Deactivation Pdp : %s', perfdatas => [ - { label => 'attempted_self_deactivation_pdp', value => 'ggsnApnAttemptedSelfDeactivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'attempted_self_deactivation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -146,7 +146,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnCompletedActivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Completed Activation Pdp : %s', perfdatas => [ - { label => 'completed_activation_pdp', value => 'ggsnApnCompletedActivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'completed_activation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -154,7 +154,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnCompletedDynActivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Completed Dyn Activation Pdp : %s', perfdatas => [ - { label => 'completed_dyn_activation_pdp', value => 'ggsnApnCompletedDynActivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'completed_dyn_activation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -162,7 +162,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnCompletedDeactivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Completed Deactivation Pdp : %s', perfdatas => [ - { label => 'completed_deactivation_pdp', value => 'ggsnApnCompletedDeactivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'completed_deactivation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -170,7 +170,7 @@ sub set_counters { key_values => [ { name => 'ggsnApnCompletedSelfDeactivation', diff => 1 }, { name => 'ggsnApnName' } ], output_template => 'Completed Self Deactivation Pdp : %s', perfdatas => [ - { label => 'completed_self_deactivation_pdp', value => 'ggsnApnCompletedSelfDeactivation_absolute', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName_absolute' }, + { label => 'completed_self_deactivation_pdp', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'ggsnApnName' }, ], } }, @@ -183,7 +183,7 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, + 'filter-name:s' => { name => 'filter_name' } }); return $self; diff --git a/network/juniper/ggsn/mode/globalstats.pm b/network/juniper/ggsn/mode/globalstats.pm index 0753bb493..ca1b15ec1 100644 --- a/network/juniper/ggsn/mode/globalstats.pm +++ b/network/juniper/ggsn/mode/globalstats.pm @@ -29,12 +29,12 @@ use Digest::MD5 qw(md5_hex); sub custom_drop_in_calc { my ($self, %options) = @_; - $self->{result_values}->{ggsnUplinkDrops_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnUplinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnUplinkDrops'}; - $self->{result_values}->{ggsnUplinkPackets_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnUplinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnUplinkPackets'}; - if ($self->{result_values}->{ggsnUplinkPackets_absolute} == 0) { + $self->{result_values}->{ggsnUplinkDrops} = $options{new_datas}->{$self->{instance} . '_ggsnUplinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnUplinkDrops'}; + $self->{result_values}->{ggsnUplinkPackets} = $options{new_datas}->{$self->{instance} . '_ggsnUplinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnUplinkPackets'}; + if ($self->{result_values}->{ggsnUplinkPackets} == 0) { $self->{result_values}->{drop_prct} = 0; } else { - $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnUplinkDrops_absolute} * 100 / $self->{result_values}->{ggsnUplinkPackets_absolute}; + $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnUplinkDrops} * 100 / $self->{result_values}->{ggsnUplinkPackets}; } return 0; } @@ -42,12 +42,12 @@ sub custom_drop_in_calc { sub custom_drop_out_calc { my ($self, %options) = @_; - $self->{result_values}->{ggsnDownlinkDrops_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnDownlinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnDownlinkDrops'}; - $self->{result_values}->{ggsnDownlinkPackets_absolute} = $options{new_datas}->{$self->{instance} . '_ggsnDownlinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnDownlinkPackets'}; - if ($self->{result_values}->{ggsnDownlinkPackets_absolute} == 0) { + $self->{result_values}->{ggsnDownlinkDrops} = $options{new_datas}->{$self->{instance} . '_ggsnDownlinkDrops'} - $options{old_datas}->{$self->{instance} . '_ggsnDownlinkDrops'}; + $self->{result_values}->{ggsnDownlinkPackets} = $options{new_datas}->{$self->{instance} . '_ggsnDownlinkPackets'} - $options{old_datas}->{$self->{instance} . '_ggsnDownlinkPackets'}; + if ($self->{result_values}->{ggsnDownlinkPackets} == 0) { $self->{result_values}->{drop_prct} = 0; } else { - $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnDownlinkDrops_absolute} * 100 / $self->{result_values}->{ggsnDownlinkPackets_absolute}; + $self->{result_values}->{drop_prct} = $self->{result_values}->{ggsnDownlinkDrops} * 100 / $self->{result_values}->{ggsnDownlinkPackets}; } return 0; } @@ -61,22 +61,20 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'ggsnUplinkBytes', diff => 1 } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'ggsnUplinkBytes', per_second => 1 } ], output_template => 'Traffic In : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'ggsnUplinkBytes_per_second', template => '%s', - unit => 'b/s', min => 0, cast_int => 1 }, + { label => 'traffic_in', template => '%s', unit => 'b/s', min => 0, cast_int => 1 }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'ggsnDownlinkBytes', diff => 1 } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'ggsnDownlinkBytes', per_second => 1 } ], output_template => 'Traffic Out : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'ggsnDownlinkBytes_per_second', template => '%s', - unit => 'b/s', min => 0, cast_int => 1 }, + { label => 'traffic_out', template => '%s', unit => 'b/s', min => 0, cast_int => 1 }, ], } }, @@ -85,8 +83,8 @@ sub set_counters { output_template => 'Drop In Packets : %.2f %%', threshold_use => 'drop_prct', output_use => 'drop_prct', closure_custom_calc => \&custom_drop_in_calc, perfdatas => [ - { label => 'drop_in', value => 'ggsnUplinkDrops_absolute', template => '%s', - min => 0, max => 'ggsnUplinkPackets_absolute' }, + { label => 'drop_in', value => 'ggsnUplinkDrops', template => '%s', + min => 0, max => 'ggsnUplinkPackets' }, ], } }, @@ -95,8 +93,8 @@ sub set_counters { output_template => 'Drop Out Packets : %.2f %%', threshold_use => 'drop_prct', output_use => 'drop_prct', closure_custom_calc => \&custom_drop_out_calc, perfdatas => [ - { label => 'drop_out', value => 'ggsnDownlinkDrops_absolute', template => '%s', - min => 0, max => 'ggsnDownlinkPackets_absolute' }, + { label => 'drop_out', value => 'ggsnDownlinkDrops', template => '%s', + min => 0, max => 'ggsnDownlinkPackets' }, ], } }, @@ -104,7 +102,7 @@ sub set_counters { key_values => [ { name => 'ggsnNbrOfActivePdpContexts' } ], output_template => 'Active Pdp : %s', perfdatas => [ - { label => 'active_pdp', value => 'ggsnNbrOfActivePdpContexts_absolute', template => '%s', min => 0 }, + { label => 'active_pdp', template => '%s', min => 0 }, ], } }, @@ -112,7 +110,7 @@ sub set_counters { key_values => [ { name => 'ggsnAttemptedActivation', diff => 1 } ], output_template => 'Attempted Activation Pdp : %s', perfdatas => [ - { label => 'attempted_activation_pdp', value => 'ggsnAttemptedActivation_absolute', template => '%s', min => 0 }, + { label => 'attempted_activation_pdp', template => '%s', min => 0 }, ], } }, @@ -120,7 +118,7 @@ sub set_counters { key_values => [ { name => 'ggsnAttemptedDeactivation', diff => 1 } ], output_template => 'Attempted Deactivation Pdp : %s', perfdatas => [ - { label => 'attempted_deactivation_pdp', value => 'ggsnAttemptedDeactivation_absolute', template => '%s', min => 0 }, + { label => 'attempted_deactivation_pdp', template => '%s', min => 0 }, ], } }, @@ -128,7 +126,7 @@ sub set_counters { key_values => [ { name => 'ggsnAttemptedDeactivation', diff => 1 } ], output_template => 'Attempted Deactivation Pdp : %s', perfdatas => [ - { label => 'attempted_deactivation_pdp', value => 'ggsnAttemptedDeactivation_absolute', template => '%s', min => 0 }, + { label => 'attempted_deactivation_pdp', template => '%s', min => 0 }, ], } }, @@ -136,7 +134,7 @@ sub set_counters { key_values => [ { name => 'ggsnAttemptedSelfDeactivation', diff => 1 } ], output_template => 'Attempted Self Deactivation Pdp : %s', perfdatas => [ - { label => 'attempted_self_deactivation_pdp', value => 'ggsnAttemptedSelfDeactivation_absolute', template => '%s', min => 0 }, + { label => 'attempted_self_deactivation_pdp', template => '%s', min => 0 }, ], } }, @@ -144,7 +142,7 @@ sub set_counters { key_values => [ { name => 'ggsnAttemptedUpdate', diff => 1 } ], output_template => 'Attempted Update Pdp : %s', perfdatas => [ - { label => 'attempted_update_pdp', value => 'ggsnAttemptedUpdate_absolute', template => '%s', min => 0 }, + { label => 'attempted_update_pdp', template => '%s', min => 0 }, ], } }, @@ -152,7 +150,7 @@ sub set_counters { key_values => [ { name => 'ggsnCompletedActivation', diff => 1 } ], output_template => 'Completed Activation Pdp : %s', perfdatas => [ - { label => 'completed_activation_pdp', value => 'ggsnCompletedActivation_absolute', template => '%s', min => 0 }, + { label => 'completed_activation_pdp', template => '%s', min => 0 }, ], } }, @@ -160,7 +158,7 @@ sub set_counters { key_values => [ { name => 'ggsnCompletedDeactivation', diff => 1 } ], output_template => 'Completed Deactivation Pdp : %s', perfdatas => [ - { label => 'completed_deactivation_pdp', value => 'ggsnCompletedDeactivation_absolute', template => '%s', min => 0 }, + { label => 'completed_deactivation_pdp', template => '%s', min => 0 }, ], } }, @@ -168,7 +166,7 @@ sub set_counters { key_values => [ { name => 'ggsnCompletedSelfDeactivation', diff => 1 } ], output_template => 'Completed Self Deactivation Pdp : %s', perfdatas => [ - { label => 'completed_self_deactivation_pdp', value => 'ggsnCompletedSelfDeactivation_absolute', template => '%s', min => 0 }, + { label => 'completed_self_deactivation_pdp', emplate => '%s', min => 0 }, ], } }, @@ -176,7 +174,7 @@ sub set_counters { key_values => [ { name => 'ggsnCompletedUpdate', diff => 1 } ], output_template => 'Completed Update Pdp : %s', perfdatas => [ - { label => 'completed_update_pdp', value => 'ggsnCompletedUpdate_absolute', template => '%s', min => 0 }, + { label => 'completed_update_pdp', template => '%s', min => 0 }, ], } }, diff --git a/network/juniper/trapeze/snmp/mode/apstatus.pm b/network/juniper/trapeze/snmp/mode/apstatus.pm index d528e3717..378158ba4 100644 --- a/network/juniper/trapeze/snmp/mode/apstatus.pm +++ b/network/juniper/trapeze/snmp/mode/apstatus.pm @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total ap : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } diff --git a/network/juniper/trapeze/snmp/mode/apusers.pm b/network/juniper/trapeze/snmp/mode/apusers.pm index 8f0b0ed85..10245b263 100644 --- a/network/juniper/trapeze/snmp/mode/apusers.pm +++ b/network/juniper/trapeze/snmp/mode/apusers.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Users : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', unit => 'users', min => 0 }, ], } @@ -51,8 +51,8 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'display' } ], output_template => 'users : %s', perfdatas => [ - { label => 'ssid', value => 'total_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ssid', value => 'total', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -63,8 +63,8 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'display' } ], output_template => 'users : %s', perfdatas => [ - { label => 'ap', value => 'total_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ap', value => 'total', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/juniper/trapeze/snmp/mode/cpu.pm b/network/juniper/trapeze/snmp/mode/cpu.pm index bf65b9dc6..255a26e1a 100644 --- a/network/juniper/trapeze/snmp/mode/cpu.pm +++ b/network/juniper/trapeze/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'trpzSysCpuAverageLoad' } ], output_template => 'average : %.2f %%', perfdatas => [ - { label => 'cpu_average', value => 'trpzSysCpuAverageLoad_absolute', template => '%.2f', + { label => 'cpu_average', value => 'trpzSysCpuAverageLoad', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'trpzSysCpuLastMinuteLoad' } ], output_template => '1 minute : %.2f %%', perfdatas => [ - { label => 'cpu_1m', value => 'trpzSysCpuLastMinuteLoad_absolute', template => '%.2f', + { label => 'cpu_1m', value => 'trpzSysCpuLastMinuteLoad', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'trpzSysCpuLast5MinutesLoad' } ], output_template => '5 minutes : %.2f %%', perfdatas => [ - { label => 'cpu_5m', value => 'trpzSysCpuLast5MinutesLoad_absolute', template => '%.2f', + { label => 'cpu_5m', value => 'trpzSysCpuLast5MinutesLoad', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => ' trpzSysCpuLastHourLoad' } ], output_template => '1 hour : %.2f %%', perfdatas => [ - { label => 'cpu_1h', value => ' trpzSysCpuLastHourLoad_absolute', template => '%.2f', + { label => 'cpu_1h', value => ' trpzSysCpuLastHourLoad', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/juniper/trapeze/snmp/mode/memory.pm b/network/juniper/trapeze/snmp/mode/memory.pm index f9ec9c328..f824b74b0 100644 --- a/network/juniper/trapeze/snmp/mode/memory.pm +++ b/network/juniper/trapeze/snmp/mode/memory.pm @@ -28,14 +28,14 @@ use warnings; sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); my $msg = sprintf("Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_absolute}, - $total_free_value . " " . $total_free_unit, 100 - $self->{result_values}->{prct_used_absolute}); + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used}, + $total_free_value . " " . $total_free_unit, 100 - $self->{result_values}->{prct_used}); return $msg; } @@ -51,10 +51,10 @@ sub set_counters { { label => 'memory', set => { key_values => [ { name => 'prct_used'}, { name => 'used' }, { name => 'free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), - threshold_use => 'prct_used_absolute', + threshold_use => 'prct_used', perfdatas => [ - { label => 'memory', value => 'used_absolute', template => '%.2f', threshold_total => 'total_absolute', cast_int => 1, - min => 0, max => 'total_absolute', unit => 'B' }, + { label => 'memory', value => 'used', template => '%.2f', threshold_total => 'total', cast_int => 1, + min => 0, max => 'total', unit => 'B' }, ], } }, @@ -63,10 +63,10 @@ sub set_counters { { label => 'flash', set => { key_values => [ { name => 'prct_used' }, { name => 'used' }, { name => 'free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), - threshold_use => 'prct_used_absolute', + threshold_use => 'prct_used', perfdatas => [ - { label => 'flash', value => 'used_absolute', template => '%.2f', threshold_total => 'total_absolute', cast_int => 1, - min => 0, max => 'total_absolute', unit => 'B' }, + { label => 'flash', value => 'used', template => '%.2f', threshold_total => 'total', cast_int => 1, + min => 0, max => 'total', unit => 'B' }, ], } }, diff --git a/network/kemp/snmp/mode/rsstatus.pm b/network/kemp/snmp/mode/rsstatus.pm index 934ac0dbb..dba4ec7c8 100644 --- a/network/kemp/snmp/mode/rsstatus.pm +++ b/network/kemp/snmp/mode/rsstatus.pm @@ -62,28 +62,25 @@ sub set_counters { key_values => [ { name => 'rSActiveConns' }, { name => 'display' } ], output_template => 'Active connections : %s', perfdatas => [ - { label => 'active', value => 'rSActiveConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'active', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'in-traffic', set => { - key_values => [ { name => 'rSInBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'rSInBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'rSInBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'out-traffic', set => { - key_values => [ { name => 'rSOutBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'rSOutBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'rSOutBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -95,13 +92,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} !~ /inService|disabled/i' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /inService|disabled/i' } + }); + return $self; } diff --git a/network/kemp/snmp/mode/vsstatus.pm b/network/kemp/snmp/mode/vsstatus.pm index 700f6c9a6..295fc3a63 100644 --- a/network/kemp/snmp/mode/vsstatus.pm +++ b/network/kemp/snmp/mode/vsstatus.pm @@ -62,31 +62,28 @@ sub set_counters { key_values => [ { name => 'vSActivConns' }, { name => 'display' } ], output_template => 'Active connections : %s', perfdatas => [ - { label => 'active', value => 'vSActivConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'active', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'in-traffic', set => { - key_values => [ { name => 'vSInBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'vSInBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'vSInBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'out-traffic', set => { - key_values => [ { name => 'vSOutBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'vSOutBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'vSOutBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'traffic_out', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, + ] } - }, + } ]; } @@ -95,13 +92,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} !~ /inService|disabled|redirect/i' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /inService|disabled|redirect/i' } + }); + return $self; } diff --git a/network/lenovo/flexsystem/snmp/mode/cpu.pm b/network/lenovo/flexsystem/snmp/mode/cpu.pm index 869d1bdb6..79312b7b6 100644 --- a/network/lenovo/flexsystem/snmp/mode/cpu.pm +++ b/network/lenovo/flexsystem/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'average_1m' }, { name => 'display' } ], output_template => '%.2f %% (1m)', perfdatas => [ - { value => 'average_1m_absolute', template => '%.2f', + { value => 'average_1m', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'average_5m' }, { name => 'display' } ], output_template => '%.2f %% (5m)', perfdatas => [ - { value => 'average_5m_absolute', template => '%.2f', + { value => 'average_5m', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } diff --git a/network/lenovo/flexsystem/snmp/mode/memory.pm b/network/lenovo/flexsystem/snmp/mode/memory.pm index aeddb4205..73afad8a7 100644 --- a/network/lenovo/flexsystem/snmp/mode/memory.pm +++ b/network/lenovo/flexsystem/snmp/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_usage_output { return sprintf( 'Ram Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1 } ] } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1 } ] } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Ram Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } diff --git a/network/libraesva/snmp/mode/system.pm b/network/libraesva/snmp/mode/system.pm index 6f9d5a58c..34a7b57a5 100644 --- a/network/libraesva/snmp/mode/system.pm +++ b/network/libraesva/snmp/mode/system.pm @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'mailSent', diff => 1 } ], output_template => 'mails sent: %s', perfdatas => [ - { value => 'mailSent_absolute', template => '%s', min => 0 }, + { value => 'mailSent', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'mailReceived', diff => 1 } ], output_template => 'mails received: %s', perfdatas => [ - { value => 'mailReceived_absolute', template => '%s', min => 0 }, + { value => 'mailReceived', template => '%s', min => 0 }, ], } }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'mailRejected', diff => 1 } ], output_template => 'mails rejected: %s', perfdatas => [ - { value => 'mailRejected_absolute', template => '%s', min => 0 }, + { value => 'mailRejected', template => '%s', min => 0 }, ], } }, @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'mailBounced', diff => 1 } ], output_template => 'mails bounced: %s', perfdatas => [ - { value => 'mailBounced_absolute', template => '%s', min => 0 }, + { value => 'mailBounced', template => '%s', min => 0 }, ], } }, @@ -77,7 +77,7 @@ sub set_counters { key_values => [ { name => 'spamMessages', diff => 1 } ], output_template => 'spam messages: %s', perfdatas => [ - { value => 'spamMessages_absolute', template => '%s', min => 0 }, + { value => 'spamMessages', template => '%s', min => 0 }, ], } }, @@ -85,7 +85,7 @@ sub set_counters { key_values => [ { name => 'virusMessages', diff => 1 } ], output_template => 'virus messages: %s', perfdatas => [ - { value => 'virusMessages_absolute', template => '%s', min => 0 }, + { value => 'virusMessages', template => '%s', min => 0 }, ], } }, @@ -93,7 +93,7 @@ sub set_counters { key_values => [ { name => 'incomingMailQueue' } ], output_template => 'mails queue in: %s', perfdatas => [ - { value => 'incomingMailQueue_absolute', template => '%s', min => 0 }, + { value => 'incomingMailQueue', template => '%s', min => 0 }, ], } }, @@ -101,7 +101,7 @@ sub set_counters { key_values => [ { name => 'outgoingMailQueue' } ], output_template => 'mails queue out: %s', perfdatas => [ - { value => 'outgoingMailQueue_absolute', template => '%s', min => 0 }, + { value => 'outgoingMailQueue', template => '%s', min => 0 }, ], } }, diff --git a/network/mikrotik/snmp/mode/signal.pm b/network/mikrotik/snmp/mode/signal.pm index ec02d07da..4c5922087 100644 --- a/network/mikrotik/snmp/mode/signal.pm +++ b/network/mikrotik/snmp/mode/signal.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'mtxrWlRtabStrength' }, { name => 'display' } ], output_template => 'signal strength Rx: %s dBm', perfdatas => [ - { label => 'signal_rx', value => 'mtxrWlRtabStrength_absolute', template => '%s', unit => 'dBm', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'signal_rx', value => 'mtxrWlRtabStrength', template => '%s', unit => 'dBm', + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -46,8 +46,8 @@ sub set_counters { key_values => [ { name => 'mtxrWlRtabTxStrength' }, { name => 'display' } ], output_template => 'signal strength Tx: %s dBm', perfdatas => [ - { label => 'signal_tx', value => 'mtxrWlRtabTxStrength_absolute', template => '%s', unit => 'dBm', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'signal_tx', value => 'mtxrWlRtabTxStrength', template => '%s', unit => 'dBm', + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'mtxrWlRtabSignalToNoise', no_value => 0 }, { name => 'display' } ], output_template => 'signal to noise: %s dB', perfdatas => [ - { label => 'signal_noise', value => 'mtxrWlRtabSignalToNoise_absolute', template => '%s', unit => 'dB', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'signal_noise', value => 'mtxrWlRtabSignalToNoise', template => '%s', unit => 'dB', + label_extra_instance => 1, instance_use => 'display' }, ], } } diff --git a/network/mitel/3300icp/snmp/mode/zapcalls.pm b/network/mitel/3300icp/snmp/mode/zapcalls.pm index aaab7b4d5..c58a7913d 100644 --- a/network/mitel/3300icp/snmp/mode/zapcalls.pm +++ b/network/mitel/3300icp/snmp/mode/zapcalls.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'mitelBWMCumCACAdmissions', diff => 1 }, { name => 'display' } ], output_template => 'Admitted calls: %s', perfdatas => [ - { label => 'admitted', value => 'mitelBWMCumCACAdmissions_absolute', template => '%s', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'admitted', value => 'mitelBWMCumCACAdmissions', template => '%s', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'mitelBWMCumCACRejections', diff => 1 }, { name => 'display' } ], output_template => 'Rejected calls: %s', perfdatas => [ - { label => 'rejected', value => 'mitelBWMCumCACRejections_absolute', template => '%s', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'rejected', value => 'mitelBWMCumCACRejections', template => '%s', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'mitelBWMCumCACRejectionRatio' }, { name => 'display' } ], output_template => 'Rejection ratio: %s%%', perfdatas => [ - { label => 'rejection_ratio', value => 'mitelBWMCumCACRejectionRatio_absolute', template => '%s', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'rejection_ratio', value => 'mitelBWMCumCACRejectionRatio', template => '%s', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/moxa/switch/snmp/mode/cpu.pm b/network/moxa/switch/snmp/mode/cpu.pm index a947d11e8..05ca0e741 100644 --- a/network/moxa/switch/snmp/mode/cpu.pm +++ b/network/moxa/switch/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpuLoading5s' } ], output_template => '5 seconds : %.2f %%', perfdatas => [ - { label => 'cpu_5s', value => 'cpuLoading5s_absolute', template => '%.2f', + { label => 'cpu_5s', value => 'cpuLoading5s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'cpuLoading30s' } ], output_template => '30 seconds : %.2f %%', perfdatas => [ - { label => 'cpu_30s', value => 'cpuLoading30s_absolute', template => '%.2f', + { label => 'cpu_30s', value => 'cpuLoading30s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'cpuLoading300s' } ], output_template => '300 seconds : %.2f %%', perfdatas => [ - { label => 'cpu_300s', value => 'cpuLoading300s_absolute', template => '%.2f', + { label => 'cpu_300s', value => 'cpuLoading300s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/moxa/switch/snmp/mode/memory.pm b/network/moxa/switch/snmp/mode/memory.pm index 2aca2b174..d0354efc5 100644 --- a/network/moxa/switch/snmp/mode/memory.pm +++ b/network/moxa/switch/snmp/mode/memory.pm @@ -28,14 +28,14 @@ use warnings; sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); my $msg = sprintf("Memory Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_absolute}, - $total_free_value . " " . $total_free_unit, 100 - $self->{result_values}->{prct_used_absolute}); + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used}, + $total_free_value . " " . $total_free_unit, 100 - $self->{result_values}->{prct_used}); return $msg; } @@ -50,11 +50,11 @@ sub set_counters { { label => 'usage', set => { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'total' }, { name => 'prct_used' } ], closure_custom_output => $self->can('custom_usage_output'), - threshold_use => 'prct_used_absolute', + threshold_use => 'prct_used', perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%.2f', - threshold_total => 'total_absolute', cast_int => 1, - min => 0, max => 'total_absolute', unit => 'B' }, + { label => 'used', value => 'used', template => '%.2f', + threshold_total => 'total', cast_int => 1, + min => 0, max => 'total', unit => 'B' }, ], } }, diff --git a/network/mrv/optiswitch/snmp/mode/interfaces.pm b/network/mrv/optiswitch/snmp/mode/interfaces.pm index e49c9c1ef..f2cd1e64a 100644 --- a/network/mrv/optiswitch/snmp/mode/interfaces.pm +++ b/network/mrv/optiswitch/snmp/mode/interfaces.pm @@ -55,20 +55,20 @@ sub set_counters_global { { label => 'total-link-up', filter => 'add_global', nlabel => 'total.interfaces.link.up.count', set => { key_values => [ { name => 'global_link_up' }, { name => 'total_port' } ], output_template => 'LinkStatus Up : %s', output_error_template => 'LinkStatus Up : %s', - output_use => 'global_link_up_absolute', threshold_use => 'global_link_up_absolute', + output_use => 'global_link_up', threshold_use => 'global_link_up', perfdatas => [ - { label => 'total_link_up', value => 'global_link_up_absolute', template => '%s', - min => 0, max => 'total_port_absolute' }, + { label => 'total_link_up', value => 'global_link_up', template => '%s', + min => 0, max => 'total_port' }, ], } }, { label => 'total-link-down', filter => 'add_global', nlabel => 'total.interfaces.link.down.count', set => { key_values => [ { name => 'global_link_down' }, { name => 'total_port' } ], output_template => 'LinkStatus Down : %s', output_error_template => 'LinkStatus Down : %s', - output_use => 'global_link_down_absolute', threshold_use => 'global_link_down_absolute', + output_use => 'global_link_down', threshold_use => 'global_link_down', perfdatas => [ - { label => 'total_link_down', value => 'global_link_down_absolute', template => '%s', - min => 0, max => 'total_port_absolute' }, + { label => 'total_link_down', value => 'global_link_down', template => '%s', + min => 0, max => 'total_port' }, ], } }, diff --git a/network/netgear/mseries/snmp/mode/cpu.pm b/network/netgear/mseries/snmp/mode/cpu.pm index b496f1101..f31042cf2 100644 --- a/network/netgear/mseries/snmp/mode/cpu.pm +++ b/network/netgear/mseries/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'usage_5s' } ], output_template => '%.2f %% (5sec)', output_error_template => "%s (5sec)", perfdatas => [ - { label => 'cpu_5s', value => 'usage_5s_absolute', template => '%.2f', + { label => 'cpu_5s', value => 'usage_5s', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'usage_1m' } ], output_template => '%.2f %% (1m)', output_error_template => "%s (1min)", perfdatas => [ - { label => 'cpu_1m', value => 'usage_1m_absolute', template => '%.2f', + { label => 'cpu_1m', value => 'usage_1m', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'usage_5m' } ], output_template => '%.2f %% (5min)', output_error_template => "%s (5min)", perfdatas => [ - { label => 'cpu_5m', value => 'usage_5m_absolute', template => '%.2f', + { label => 'cpu_5m', value => 'usage_5m', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/network/nokia/timos/snmp/mode/bgpusage.pm b/network/nokia/timos/snmp/mode/bgpusage.pm index 3c86b2053..6c2c6bedd 100644 --- a/network/nokia/timos/snmp/mode/bgpusage.pm +++ b/network/nokia/timos/snmp/mode/bgpusage.pm @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => 'active_prefixes' }, { name => 'display' } ], output_template => 'Active Prefixes : %s', perfdatas => [ - { label => 'active_prefixes', value => 'active_prefixes_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'active_prefixes', value => 'active_prefixes', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -70,8 +70,8 @@ sub set_counters { key_values => [ { name => 'sent_prefixes', diff => 1 }, { name => 'display' } ], output_template => 'Sent Prefixes : %s', perfdatas => [ - { label => 'sent_prefixes', value => 'sent_prefixes_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'sent_prefixes', value => 'sent_prefixes', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -79,8 +79,8 @@ sub set_counters { key_values => [ { name => 'received_prefixes', diff => 1 }, { name => 'display' } ], output_template => 'Received Prefixes : %s', perfdatas => [ - { label => 'received_prefixes', value => 'received_prefixes_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'received_prefixes', value => 'received_prefixes', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/nokia/timos/snmp/mode/cpu.pm b/network/nokia/timos/snmp/mode/cpu.pm index c83cbf859..0c30c84d8 100644 --- a/network/nokia/timos/snmp/mode/cpu.pm +++ b/network/nokia/timos/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu' } ], output_template => 'Usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', + { label => 'cpu', value => 'cpu', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/nokia/timos/snmp/mode/isisusage.pm b/network/nokia/timos/snmp/mode/isisusage.pm index 75c128648..845b6a584 100644 --- a/network/nokia/timos/snmp/mode/isisusage.pm +++ b/network/nokia/timos/snmp/mode/isisusage.pm @@ -87,8 +87,8 @@ sub set_counters { key_values => [ { name => 'inService' }, { name => 'display' } ], output_template => 'Total Interfaces InServices : %s', perfdatas => [ - { label => 'total_int_inservice', value => 'inService_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_int_inservice', value => 'inService', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -96,8 +96,8 @@ sub set_counters { key_values => [ { name => 'outOfService' }, { name => 'display' } ], output_template => 'Total Interfaces OutOfServices : %s', perfdatas => [ - { label => 'total_int_outservice', value => 'outOfService_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_int_outservice', value => 'outOfService', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/nokia/timos/snmp/mode/l2tpusage.pm b/network/nokia/timos/snmp/mode/l2tpusage.pm index 62c18b82b..9892a5abb 100644 --- a/network/nokia/timos/snmp/mode/l2tpusage.pm +++ b/network/nokia/timos/snmp/mode/l2tpusage.pm @@ -93,8 +93,8 @@ sub set_counters { key_values => [ { name => 'total_tunnel' }, { name => 'display' } ], output_template => 'Total : %s', perfdatas => [ - { label => 'vrtr_total_tunnel', value => 'total_tunnel_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'vrtr_total_tunnel', value => 'total_tunnel', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -102,8 +102,8 @@ sub set_counters { key_values => [ { name => 'active_sessions' }, { name => 'display' } ], output_template => 'Active Sessions : %s', perfdatas => [ - { label => 'vrtr_tunnel_active_sessions', value => 'active_sessions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'vrtr_tunnel_active_sessions', value => 'active_sessions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -115,7 +115,7 @@ sub set_counters { closure_custom_calc => $self->can('custom_total_sessions_calc'), perfdatas => [ { label => 'vrtr_tunnel_total_sessions', value => 'total_sessions', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -126,8 +126,8 @@ sub set_counters { key_values => [ { name => 'total_tunnel' }, { name => 'display' } ], output_template => 'Total : %s', perfdatas => [ - { label => 'peer_total_tunnel', value => 'total_tunnel_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'peer_total_tunnel', value => 'total_tunnel', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -135,8 +135,8 @@ sub set_counters { key_values => [ { name => 'active_sessions' }, { name => 'display' } ], output_template => 'Active Sessions : %s', perfdatas => [ - { label => 'peer_tunnel_active_sessions', value => 'active_sessions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'peer_tunnel_active_sessions', value => 'active_sessions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -148,7 +148,7 @@ sub set_counters { closure_custom_calc => $self->can('custom_total_sessions_calc'), perfdatas => [ { label => 'peer_tunnel_total_sessions', value => 'total_sessions', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/nokia/timos/snmp/mode/ldpusage.pm b/network/nokia/timos/snmp/mode/ldpusage.pm index f0baa3b1d..cea94cb98 100644 --- a/network/nokia/timos/snmp/mode/ldpusage.pm +++ b/network/nokia/timos/snmp/mode/ldpusage.pm @@ -63,8 +63,8 @@ sub set_counters { key_values => [ { name => 'ipv4_active_sessions' }, { name => 'display' } ], output_template => 'IPv4 Active Sessions : %s', perfdatas => [ - { label => 'ipv4_active_sessions', value => 'ipv4_active_sessions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ipv4_active_sessions', value => 'ipv4_active_sessions', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -72,8 +72,8 @@ sub set_counters { key_values => [ { name => 'ipv4_active_link_adj' }, { name => 'display' } ], output_template => 'IPv4 Active Link Adjacencies : %s', perfdatas => [ - { label => 'ipv4_active_link_adj', value => 'ipv4_active_link_adj_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ipv4_active_link_adj', value => 'ipv4_active_link_adj', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -81,8 +81,8 @@ sub set_counters { key_values => [ { name => 'ipv4_active_target_adj' }, { name => 'display' } ], output_template => 'IPv4 Active Target Adjacencies : %s', perfdatas => [ - { label => 'ipv4_active_target_adj', value => 'ipv4_active_target_adj_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ipv4_active_target_adj', value => 'ipv4_active_target_adj', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -90,8 +90,8 @@ sub set_counters { key_values => [ { name => 'ipv4_oper_down_events', diff => 1 }, { name => 'display' } ], output_template => 'IPv4 Oper Down Events : %s', perfdatas => [ - { label => 'ipv4_oper_down_events', value => 'ipv4_oper_down_events_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ipv4_oper_down_events', value => 'ipv4_oper_down_events', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/nokia/timos/snmp/mode/sapusage.pm b/network/nokia/timos/snmp/mode/sapusage.pm index fb5287f5c..fac76b7de 100644 --- a/network/nokia/timos/snmp/mode/sapusage.pm +++ b/network/nokia/timos/snmp/mode/sapusage.pm @@ -56,46 +56,42 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'traffic-in-below-cir', set => { - key_values => [ { name => 'sapBaseStatsIngressQchipForwardedInProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'sapBaseStatsIngressQchipForwardedInProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In Below CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in_below_cir', value => 'sapBaseStatsIngressQchipForwardedInProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_below_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in-above-cir', set => { - key_values => [ { name => 'sapBaseStatsIngressQchipForwardedOutProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'sapBaseStatsIngressQchipForwardedOutProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In Above CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in_above_cir', value => 'sapBaseStatsIngressQchipForwardedOutProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_above_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out-below-cir', set => { - key_values => [ { name => 'sapBaseStatsEgressQchipForwardedInProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'sapBaseStatsEgressQchipForwardedInProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out Below CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out_below_cir', value => 'sapBaseStatsEgressQchipForwardedInProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_below_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out-above-cir', set => { - key_values => [ { name => 'sapBaseStatsEgressQchipForwardedOutProfOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'sapBaseStatsEgressQchipForwardedOutProfOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out Above CIR : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out_above_cir', value => 'sapBaseStatsEgressQchipForwardedOutProfOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_above_cir', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -113,12 +109,11 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{admin_state} eq "up" and %{oper_state} !~ /up/' }, - }); + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{admin_state} eq "up" and %{oper_state} !~ /up/' } + }); return $self; } diff --git a/network/nortel/standard/snmp/mode/cpu.pm b/network/nortel/standard/snmp/mode/cpu.pm index f95ef9523..709d2967c 100644 --- a/network/nortel/standard/snmp/mode/cpu.pm +++ b/network/nortel/standard/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'num' } ], output_template => '%.2f %% (total)', perfdatas => [ - { label => 'cpu_total', value => 'total_absolute', template => '%.2f', + { label => 'cpu_total', value => 'total', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => '1m' }, { name => 'num' } ], output_template => '%.2f %% (1min)', perfdatas => [ - { label => 'cpu_1min', value => '1m_absolute', template => '%.2f', + { label => 'cpu_1min', value => '1m', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => '5m' }, { name => 'num' } ], output_template => '%.2f %% (5min)', perfdatas => [ - { label => 'cpu_5min', value => '5m_absolute', template => '%.2f', + { label => 'cpu_5min', value => '5m', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => '10m' }, { name => 'num' } ], output_template => '%.2f %% (10min)', perfdatas => [ - { label => 'cpu_10min', value => '10m_absolute', template => '%.2f', + { label => 'cpu_10min', value => '10m', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => '1h' }, { name => 'num' } ], output_template => '%.2f %% (1h)', perfdatas => [ - { label => 'cpu_1h', value => '1h_absolute', template => '%.2f', + { label => 'cpu_1h', value => '1h', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } diff --git a/network/nortel/standard/snmp/mode/memory.pm b/network/nortel/standard/snmp/mode/memory.pm index 6a18a407b..2212cb51d 100644 --- a/network/nortel/standard/snmp/mode/memory.pm +++ b/network/nortel/standard/snmp/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_usage_output { return sprintf( 'total: %s %s used: %s %s (%.2f%%) free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1 } ] } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1 } ] } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'used: %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%', + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 }, ] } diff --git a/network/oracle/infiniband/snmp/mode/infinibandusage.pm b/network/oracle/infiniband/snmp/mode/infinibandusage.pm index b89c2b840..bd9f812cb 100644 --- a/network/oracle/infiniband/snmp/mode/infinibandusage.pm +++ b/network/oracle/infiniband/snmp/mode/infinibandusage.pm @@ -40,55 +40,52 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => $self->can('custom_status_threshold'), + closure_custom_threshold_check => $self->can('custom_status_threshold') } }, { label => 'in', set => { key_values => [ { name => 'in', diff => 1 }, { name => 'display' }, { name => 'speed_in' } ], - per_second => 1, closure_custom_calc => $self->can('custom_ib_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_ib_output'), closure_custom_perfdata => $self->can('custom_ib_perfdata'), - closure_custom_threshold_check => $self->can('custom_ib_threshold'), + closure_custom_threshold_check => $self->can('custom_ib_threshold') } }, { label => 'out', set => { key_values => [ { name => 'out', diff => 1 }, { name => 'display' }, { name => 'speed_out' } ], - per_second => 1, closure_custom_calc => $self->can('custom_ib_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_ib_output'), closure_custom_perfdata => $self->can('custom_ib_perfdata'), - closure_custom_threshold_check => $self->can('custom_ib_threshold'), + closure_custom_threshold_check => $self->can('custom_ib_threshold') } - }, + } ]; + $self->{maps_counters}->{ibgw} = [ { label => 'ibgw-status', threshold => 0, set => { key_values => [ { name => 'status' }, { name => 'display' } ], closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => $self->can('custom_status_threshold'), + closure_custom_threshold_check => $self->can('custom_status_threshold') } }, { label => 'in', set => { key_values => [ { name => 'in', diff => 1 }, { name => 'display' }, { name => 'speed_in' } ], - per_second => 1, closure_custom_calc => $self->can('custom_ib_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_ib_output'), closure_custom_perfdata => $self->can('custom_ib_perfdata'), - closure_custom_threshold_check => $self->can('custom_ib_threshold'), + closure_custom_threshold_check => $self->can('custom_ib_threshold') } }, { label => 'out', set => { key_values => [ { name => 'out', diff => 1 }, { name => 'display' }, { name => 'speed_out' } ], - per_second => 1, closure_custom_calc => $self->can('custom_ib_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_ib_output'), closure_custom_perfdata => $self->can('custom_ib_perfdata'), - closure_custom_threshold_check => $self->can('custom_ib_threshold'), + closure_custom_threshold_check => $self->can('custom_ib_threshold') } - }, + } ]; } @@ -213,15 +210,15 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-ib-name:s" => { name => 'filter_ib_name' }, - "filter-ibgw-name:s" => { name => 'filter_ibgw_name' }, - "warning-ib-status:s" => { name => 'warning_ib_status', default => '' }, - "critical-ib-status:s" => { name => 'critical_ib_status', default => '%{status} !~ /active/i' }, - "warning-ibgw-status:s" => { name => 'warning_ibgw_status', default => '' }, - "critical-ibgw-status:s" => { name => 'critical_ibgw_status', default => '%{status} !~ /up/i' }, - "speed-in:s" => { name => 'speed_in' }, - "speed-out:s" => { name => 'speed_out' }, - "units-traffic:s" => { name => 'units_traffic', default => '%' }, + 'filter-ib-name:s' => { name => 'filter_ib_name' }, + 'filter-ibgw-name:s' => { name => 'filter_ibgw_name' }, + 'warning-ib-status:s' => { name => 'warning_ib_status', default => '' }, + 'critical-ib-status:s' => { name => 'critical_ib_status', default => '%{status} !~ /active/i' }, + 'warning-ibgw-status:s' => { name => 'warning_ibgw_status', default => '' }, + 'critical-ibgw-status:s' => { name => 'critical_ibgw_status', default => '%{status} !~ /up/i' }, + 'speed-in:s' => { name => 'speed_in' }, + 'speed-out:s' => { name => 'speed_out' }, + 'units-traffic:s' => { name => 'units_traffic', default => '%' } }); return $self; diff --git a/network/oracle/otd/snmp/mode/vserverusage.pm b/network/oracle/otd/snmp/mode/vserverusage.pm index 0d60193ad..d3cde0645 100644 --- a/network/oracle/otd/snmp/mode/vserverusage.pm +++ b/network/oracle/otd/snmp/mode/vserverusage.pm @@ -35,22 +35,20 @@ sub set_counters { $self->{maps_counters}->{vs} = [ { label => 'in', set => { - key_values => [ { name => 'vsInOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'vsInOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'vsInOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'out', set => { - key_values => [ { name => 'vsOutOctets', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'vsOutOctets', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'vsOutOctets_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } } @@ -67,9 +65,8 @@ sub set_counters { key_values => [ { name => $map[$i + 2], diff => 1 }, { name => 'display' } ], output_template => $map[$i + 1], perfdatas => [ - { label => $map[$i + 3], value => $map[$i + 2] . '_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => $map[$i + 3], template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } }; } @@ -80,11 +77,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); - + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); + return $self; } diff --git a/network/paloalto/snmp/mode/cpu.pm b/network/paloalto/snmp/mode/cpu.pm index 099755cf4..022844703 100644 --- a/network/paloalto/snmp/mode/cpu.pm +++ b/network/paloalto/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'managementplane' } ], output_template => 'management plane usage is: %.2f %%', perfdatas => [ - { value => 'managementplane_absolute', template => '%.2f', + { value => 'managementplane', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'dataplane' } ], output_template => 'dataplane usage is: %.2f %%', perfdatas => [ - { value => 'dataplane_absolute', template => '%.2f', + { value => 'dataplane', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/paloalto/snmp/mode/gpusage.pm b/network/paloalto/snmp/mode/gpusage.pm index f89c5496d..dd377ca1d 100644 --- a/network/paloalto/snmp/mode/gpusage.pm +++ b/network/paloalto/snmp/mode/gpusage.pm @@ -29,11 +29,11 @@ sub custom_tunnel_output { my ($self, %options) = @_; my $msg = sprintf("tunnels total: %s used: %s (%.2f%%) free: %s (%.2f%%)", - $self->{result_values}->{total_absolute}, - $self->{result_values}->{used_absolute}, - $self->{result_values}->{prct_used_absolute}, - $self->{result_values}->{free_absolute}, - $self->{result_values}->{prct_free_absolute} + $self->{result_values}->{total}, + $self->{result_values}->{used}, + $self->{result_values}->{prct_used}, + $self->{result_values}->{free}, + $self->{result_values}->{prct_free} ); return $msg; } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_tunnel_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', cast_int => 1 }, ], } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_tunnel_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', cast_int => 1 }, ], } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'tunnels active used: %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/network/paloalto/snmp/mode/sessions.pm b/network/paloalto/snmp/mode/sessions.pm index 78567fd68..765336142 100644 --- a/network/paloalto/snmp/mode/sessions.pm +++ b/network/paloalto/snmp/mode/sessions.pm @@ -31,12 +31,12 @@ sub custom_vsys_active_perfdata { $self->{output}->perfdata_add( label => $self->{label}, nlabel => $self->{nlabel}, - instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display_absolute} : undef, - value => $self->{result_values}->{sessions_active_absolute}, + instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, + value => $self->{result_values}->{sessions_active}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0, - max => $self->{result_values}->{sessions_max_absolute} != 0 ? $self->{result_values}->{sessions_max_absolute} : undef + max => $self->{result_values}->{sessions_max} != 0 ? $self->{result_values}->{sessions_max} : undef ); } @@ -46,11 +46,11 @@ sub custom_active_perfdata { $self->{output}->perfdata_add( label => $self->{label}, nlabel => $self->{nlabel}, - value => $self->{result_values}->{sessions_active_absolute}, + value => $self->{result_values}->{sessions_active}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0, - max => $self->{result_values}->{sessions_max_absolute} != 0 ? $self->{result_values}->{sessions_max_absolute} : undef + max => $self->{result_values}->{sessions_max} != 0 ? $self->{result_values}->{sessions_max} : undef ); } @@ -58,8 +58,8 @@ sub custom_active_output { my ($self, %options) = @_; return sprintf('active: %s (%s)', - $self->{result_values}->{sessions_active_absolute}, - $self->{result_values}->{sessions_max_absolute} != 0 ? $self->{result_values}->{sessions_max_absolute} : '-' + $self->{result_values}->{sessions_active}, + $self->{result_values}->{sessions_max} != 0 ? $self->{result_values}->{sessions_max} : '-' ); } @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'sessions_active_prct' } ], output_template => 'active: %.2f %%', perfdatas => [ - { label => 'active_prct', value => 'sessions_active_prct_absolute', template => '%.2f', unit => '%', + { label => 'active_prct', value => 'sessions_active_prct', template => '%.2f', unit => '%', min => 0, max => 100 } ] } @@ -90,7 +90,7 @@ sub set_counters { key_values => [ { name => 'panSessionActiveTcp' } ], output_template => 'active TCP: %s', perfdatas => [ - { label => 'active_tcp', value => 'panSessionActiveTcp_absolute', template => '%s', min => 0 } + { label => 'active_tcp', value => 'panSessionActiveTcp', template => '%s', min => 0 } ] } }, @@ -98,7 +98,7 @@ sub set_counters { key_values => [ { name => 'panSessionActiveUdp' } ], output_template => 'active UDP: %s', perfdatas => [ - { label => 'active_udp', value => 'panSessionActiveUdp_absolute', template => '%s', min => 0 } + { label => 'active_udp', value => 'panSessionActiveUdp', template => '%s', min => 0 } ] } }, @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'panSessionActiveICMP' } ], output_template => 'active ICMP: %s', perfdatas => [ - { label => 'active_icmp', value => 'panSessionActiveICMP_absolute', template => '%s', min => 0 } + { label => 'active_icmp', value => 'panSessionActiveICMP', template => '%s', min => 0 } ] } } @@ -123,7 +123,7 @@ sub set_counters { key_values => [ { name => 'sessions_active_prct' } ], output_template => 'active: %.2f %%', perfdatas => [ - { label => 'active_prct', value => 'sessions_active_prct_absolute', template => '%.2f', unit => '%', + { label => 'active_prct', value => 'sessions_active_prct', template => '%.2f', unit => '%', min => 0, max => 100 } ] } @@ -132,7 +132,7 @@ sub set_counters { key_values => [ { name => 'panVsysActiveTcpCps' }, { name => 'display' } ], output_template => 'active TCP: %s', perfdatas => [ - { label => 'active_tcp', value => 'panVsysActiveTcpCps_absolute', template => '%s', + { label => 'active_tcp', value => 'panVsysActiveTcpCps', template => '%s', label_extra_instance => 1, min => 0 } ] } @@ -141,7 +141,7 @@ sub set_counters { key_values => [ { name => 'panVsysActiveUdpCps' }, { name => 'display' } ], output_template => 'active UDP: %s', perfdatas => [ - { label => 'active_udp', value => 'panVsysActiveUdpCps_absolute', template => '%s', + { label => 'active_udp', value => 'panVsysActiveUdpCps', template => '%s', label_extra_instance => 1, min => 0 } ] } @@ -150,7 +150,7 @@ sub set_counters { key_values => [ { name => 'panVsysActiveOtherIpCps' }, { name => 'display' } ], output_template => 'other: %s', perfdatas => [ - { label => 'active_other', value => 'panVsysActiveOtherIpCps_absolute', template => '%s', + { label => 'active_other', value => 'panVsysActiveOtherIpCps', template => '%s', label_extra_instance => 1, min => 0 } ] } diff --git a/network/paloalto/ssh/mode/interfaces.pm b/network/paloalto/ssh/mode/interfaces.pm index ac4d8e96d..ccb778615 100644 --- a/network/paloalto/ssh/mode/interfaces.pm +++ b/network/paloalto/ssh/mode/interfaces.pm @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total interfaces: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 } + { value => 'total', template => '%s', min => 0 } ] } }, diff --git a/network/paloalto/ssh/mode/ipsec.pm b/network/paloalto/ssh/mode/ipsec.pm index f1d752066..7ee5be6ed 100644 --- a/network/paloalto/ssh/mode/ipsec.pm +++ b/network/paloalto/ssh/mode/ipsec.pm @@ -51,7 +51,7 @@ sub set_counters { key_values => [ { name => 'total_ipsec' } ], output_template => 'total ipsec tunnels: %s', perfdatas => [ - { value => 'total_ipsec_absolute', template => '%s', min => 0 } + { value => 'total_ipsec', template => '%s', min => 0 } ] } } diff --git a/network/paloalto/ssh/mode/system.pm b/network/paloalto/ssh/mode/system.pm index 2cc828ac1..c56426064 100644 --- a/network/paloalto/ssh/mode/system.pm +++ b/network/paloalto/ssh/mode/system.pm @@ -41,8 +41,8 @@ sub custom_av_output { return sprintf( "antivirus version '%s', last update %s", - $self->{result_values}->{av_version_absolute}, - centreon::plugins::misc::change_seconds(value => $self->{result_values}->{av_lastupdate_time_absolute}) + $self->{result_values}->{av_version}, + centreon::plugins::misc::change_seconds(value => $self->{result_values}->{av_lastupdate_time}) ); } @@ -51,8 +51,8 @@ sub custom_threat_output { return sprintf( "threat version '%s', last update %s", - $self->{result_values}->{threat_version_absolute}, - centreon::plugins::misc::change_seconds(value => $self->{result_values}->{threat_lastupdate_time_absolute}) + $self->{result_values}->{threat_version}, + centreon::plugins::misc::change_seconds(value => $self->{result_values}->{threat_lastupdate_time}) ); } @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'av_lastupdate_time' }, { name => 'av_version' } ], closure_custom_output => $self->can('custom_av_output'), perfdatas => [ - { value => 'av_lastupdate_time_absolute', template => '%d', min => 0, unit => 's' } + { value => 'av_lastupdate_time', template => '%d', min => 0, unit => 's' } ], } }, @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'threat_lastupdate_time' }, { name => 'threat_version' } ], closure_custom_output => $self->can('custom_threat_output'), perfdatas => [ - { value => 'threat_lastupdate_time_absolute', template => '%d', min => 0, unit => 's' } + { value => 'threat_lastupdate_time', template => '%d', min => 0, unit => 's' } ], } }, @@ -93,7 +93,7 @@ sub set_counters { output_template => 'session traffic: %s %s/s', output_change_bytes => 2, perfdatas => [ - { value => 'throughput_absolute', template => '%s', + { value => 'throughput', template => '%s', unit => 'b/s', min => 0 }, ], } @@ -102,7 +102,7 @@ sub set_counters { key_values => [ { name => 'active_sessions' } ], output_template => 'total active sessions: %s', perfdatas => [ - { value => 'active_sessions_absolute', template => '%s', min => 0 }, + { value => 'active_sessions', template => '%s', min => 0 }, ], } }, diff --git a/network/peplink/pepwave/snmp/mode/cpu.pm b/network/peplink/pepwave/snmp/mode/cpu.pm index 3723db46b..002e6b9b1 100644 --- a/network/peplink/pepwave/snmp/mode/cpu.pm +++ b/network/peplink/pepwave/snmp/mode/cpu.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'cpu_load' } ], output_template => 'CPU Load %.2f %%', perfdatas => [ - { label => 'cpu_load', value => 'cpu_load_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'cpu_load', value => 'cpu_load', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } }, diff --git a/network/peplink/pepwave/snmp/mode/wanusage.pm b/network/peplink/pepwave/snmp/mode/wanusage.pm index 74ad3d5cf..934c3d7f4 100644 --- a/network/peplink/pepwave/snmp/mode/wanusage.pm +++ b/network/peplink/pepwave/snmp/mode/wanusage.pm @@ -62,31 +62,28 @@ sub set_counters { key_values => [ { name => 'signal' }, { name => 'display' } ], output_template => 'Signal Strength : %s dBm', perfdatas => [ - { label => 'signal', value => 'signal_absolute', template => '%s', unit => 'dBm', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'signal', template => '%s', unit => 'dBm', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%d', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%d', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%d', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } - }, + } ]; } @@ -100,13 +97,13 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - + $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "warning-health-status:s" => { name => 'warning_health_status', default => '' }, - "critical-health-status:s" => { name => 'critical_health_status', default => '%{health_status} =~ /fail/' }, + 'filter-name:s' => { name => 'filter_name' }, + 'warning-health-status:s' => { name => 'warning_health_status', default => '' }, + 'critical-health-status:s' => { name => 'critical_health_status', default => '%{health_status} =~ /fail/' } }); - + return $self; } diff --git a/network/perle/ids/snmp/mode/systemusage.pm b/network/perle/ids/snmp/mode/systemusage.pm index 9f05bd422..9cdfc1c26 100644 --- a/network/perle/ids/snmp/mode/systemusage.pm +++ b/network/perle/ids/snmp/mode/systemusage.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu_load' } ], output_template => 'cpu load : %.2f %%', perfdatas => [ - { value => 'cpu_load_absolute', template => '%.2f', + { value => 'cpu_load', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -47,7 +47,7 @@ sub set_counters { output_template => 'memory free : %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'memory_free_absolute', template => '%d', + { value => 'memory_free', template => '%d', min => 0, unit => 'B' }, ], } @@ -57,7 +57,7 @@ sub set_counters { output_template => 'flash disk free : %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'flashdisk_free_absolute', template => '%d', + { value => 'flashdisk_free', template => '%d', min => 0, unit => 'B' }, ], } diff --git a/network/polycom/rmx/snmp/mode/videoconferencingusage.pm b/network/polycom/rmx/snmp/mode/videoconferencingusage.pm index 10b79dc86..88317e5b7 100644 --- a/network/polycom/rmx/snmp/mode/videoconferencingusage.pm +++ b/network/polycom/rmx/snmp/mode/videoconferencingusage.pm @@ -36,7 +36,7 @@ sub set_counters { key_values => [ { name => 'NewCallsLastMinTotal' } ], output_template => 'New Calls : %s (last min)', perfdatas => [ - { label => 'calls_new', value => 'NewCallsLastMinTotal_absolute', template => '%d', min => 0 }, + { label => 'calls_new', value => 'NewCallsLastMinTotal', template => '%d', min => 0 }, ], } }, @@ -44,7 +44,7 @@ sub set_counters { key_values => [ { name => 'ActiveCallsSummaryVoiceTotalCalls' } ], output_template => 'Current Voice Calls : %s', perfdatas => [ - { label => 'calls_voice_active', value => 'ActiveCallsSummaryVoiceTotalCalls_absolute', template => '%d', min => 0 }, + { label => 'calls_voice_active', value => 'ActiveCallsSummaryVoiceTotalCalls', template => '%d', min => 0 }, ], } }, @@ -52,7 +52,7 @@ sub set_counters { key_values => [ { name => 'ActiveCallsSummaryVideoTotalCalls' } ], output_template => 'Current Video Calls : %s', perfdatas => [ - { label => 'calls_video_active', value => 'ActiveCallsSummaryVideoTotalCalls_absolute', template => '%d', min => 0 }, + { label => 'calls_video_active', value => 'ActiveCallsSummaryVideoTotalCalls', template => '%d', min => 0 }, ], } }, @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'NumberActiveConferences' } ], output_template => 'Current Conferences : %s', perfdatas => [ - { label => 'conferences_active', value => 'NumberActiveConferences_absolute', template => '%d', min => 0 }, + { label => 'conferences_active', value => 'NumberActiveConferences', template => '%d', min => 0 }, ], } }, diff --git a/network/rad/airmux/snmp/mode/radiostatus.pm b/network/rad/airmux/snmp/mode/radiostatus.pm index a0bf32336..8e35609f8 100644 --- a/network/rad/airmux/snmp/mode/radiostatus.pm +++ b/network/rad/airmux/snmp/mode/radiostatus.pm @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'rx_power' } ], output_template => 'Received signal strength: %s Dbm', perfdatas => [ - { label => 'rx_power', value => 'rx_power_absolute', template => '%s', min => 0 , unit => 'Dbm' }, + { label => 'rx_power', value => 'rx_power', template => '%s', min => 0 , unit => 'Dbm' }, ], } }, @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'tx_power' } ], output_template => 'Current transmit power: %s Dbm', perfdatas => [ - { label => 'tx_power', value => 'tx_power_absolute', template => '%s', min => 0 , unit => 'Dbm' }, + { label => 'tx_power', value => 'tx_power', template => '%s', min => 0 , unit => 'Dbm' }, ], } }, diff --git a/network/radware/alteon/snmp/mode/cpu.pm b/network/radware/alteon/snmp/mode/cpu.pm index 15c066593..ff9df860d 100644 --- a/network/radware/alteon/snmp/mode/cpu.pm +++ b/network/radware/alteon/snmp/mode/cpu.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'mp_1s' } ], output_template => '%.2f%% (1sec)', perfdatas => [ - { label => 'mp_cpu_1s', value => 'mp_1s_absolute', template => '%.2f', + { label => 'mp_cpu_1s', value => 'mp_1s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -48,7 +48,7 @@ sub set_counters { key_values => [ { name => 'mp_4s' } ], output_template => '%.2f%% (4sec)', perfdatas => [ - { label => 'mp_cpu_4s', value => 'mp_4s_absolute', template => '%.2f', + { label => 'mp_cpu_4s', value => 'mp_4s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'mp_64s' } ], output_template => '%.2f%% (64sec)', perfdatas => [ - { label => 'mp_cpu_64s', value => 'mp_64s_absolute', template => '%.2f', + { label => 'mp_cpu_64s', value => 'mp_64s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'sp_1s' } ], output_template => 'SP GA Average CPU Usage: %.2f%% (1sec)', perfdatas => [ - { label => 'avg_spga_cpu_1s', value => 'sp_1s_absolute', template => '%.2f', + { label => 'avg_spga_cpu_1s', value => 'sp_1s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'sp_4s' } ], output_template => '%.2f%% (4sec)', perfdatas => [ - { label => 'avg_spga_cpu_4s', value => 'sp_4s_absolute', template => '%.2f', + { label => 'avg_spga_cpu_4s', value => 'sp_4s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'sp_64s' } ], output_template => '%.2f%% (64sec)', perfdatas => [ - { label => 'avg_spga_cpu_64s', value => 'sp_64s_absolute', template => '%.2f', + { label => 'avg_spga_cpu_64s', value => 'sp_64s', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -99,8 +99,8 @@ sub set_counters { key_values => [ { name => 'sp_1s' }, { name => 'display' } ], output_template => '%.2f%% (1sec)', perfdatas => [ - { label => 'spga_cpu_1s', value => 'sp_1s_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'spga_cpu_1s', value => 'sp_1s', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -108,8 +108,8 @@ sub set_counters { key_values => [ { name => 'sp_4s' }, { name => 'display' } ], output_template => '%.2f%% (4sec)', perfdatas => [ - { label => 'spga_cpu_4s', value => 'sp_4s_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'spga_cpu_4s', value => 'sp_4s', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -117,8 +117,8 @@ sub set_counters { key_values => [ { name => 'sp_64s' }, { name => 'display' } ], output_template => '%.2f%% (64sec)', perfdatas => [ - { label => 'spga_cpu_64s', value => 'sp_64s_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'spga_cpu_64s', value => 'sp_64s', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/radware/alteon/snmp/mode/vserverstatus.pm b/network/radware/alteon/snmp/mode/vserverstatus.pm index 242ecf31c..2860bf4b3 100644 --- a/network/radware/alteon/snmp/mode/vserverstatus.pm +++ b/network/radware/alteon/snmp/mode/vserverstatus.pm @@ -55,16 +55,15 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } }, { label => 'traffic', set => { - key_values => [ { name => 'traffic', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic', value => 'traffic_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -72,8 +71,7 @@ sub set_counters { key_values => [ { name => 'current_sessions' }, { name => 'display' } ], output_template => 'Current Sessions : %s', perfdatas => [ - { label => 'current_sessions', value => 'current_sessions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_sessions', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -81,11 +79,10 @@ sub set_counters { key_values => [ { name => 'total_sessions', diff => 1 }, { name => 'display' } ], output_template => 'Total Sessions : %s', perfdatas => [ - { label => 'total_sessions', value => 'total_sessions_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'total_sessions', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } - }, + } ]; } @@ -99,14 +96,13 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '' }, - }); - + + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '' } + }); + return $self; } diff --git a/network/raisecom/snmp/mode/cpu.pm b/network/raisecom/snmp/mode/cpu.pm index 6fb9bf52a..b604acb35 100644 --- a/network/raisecom/snmp/mode/cpu.pm +++ b/network/raisecom/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'fiveSec' } ], output_template => '%.2f%% (5sec)', perfdatas => [ - { label => 'cpu_5s', value => 'fiveSec_absolute', template => '%.2f', + { label => 'cpu_5s', value => 'fiveSec', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'oneMin' } ], output_template => '%.2f%% (1min)', perfdatas => [ - { label => 'cpu_1m', value => 'oneMin_absolute', template => '%.2f', + { label => 'cpu_1m', value => 'oneMin', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'tenMin' } ], output_template => '%.2f%% (10min)', perfdatas => [ - { label => 'cpu_10m', value => 'tenMin_absolute', template => '%.2f', + { label => 'cpu_10m', value => 'tenMin', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'twoHour' } ], output_template => '%.2f%% (2h)', perfdatas => [ - { label => 'cpu_2h', value => 'twoHour_absolute', template => '%.2f', + { label => 'cpu_2h', value => 'twoHour', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/riverbed/interceptor/snmp/mode/neighborconnections.pm b/network/riverbed/interceptor/snmp/mode/neighborconnections.pm index 9b1253443..518c86942 100644 --- a/network/riverbed/interceptor/snmp/mode/neighborconnections.pm +++ b/network/riverbed/interceptor/snmp/mode/neighborconnections.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'neighborConnectionCount' }, { name => 'display' } ], output_template => 'Optimized Connections Count: %d', perfdatas => [ - { label => 'connections', value => 'neighborConnectionCount_absolute', template => '%d', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'connections', value => 'neighborConnectionCount', template => '%d', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/ruckus/ap/snmp/mode/cpu.pm b/network/ruckus/ap/snmp/mode/cpu.pm index 970611aee..894b95cbe 100644 --- a/network/ruckus/ap/snmp/mode/cpu.pm +++ b/network/ruckus/ap/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'cpu' } ], output_template => 'Usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', + { label => 'cpu', value => 'cpu', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/ruckus/ap/snmp/mode/users.pm b/network/ruckus/ap/snmp/mode/users.pm index 69312c138..178f74bf3 100644 --- a/network/ruckus/ap/snmp/mode/users.pm +++ b/network/ruckus/ap/snmp/mode/users.pm @@ -100,8 +100,8 @@ sub set_counters { key_values => [ { name => 'total' }, { name => 'display' } ], output_template => 'users : %s', perfdatas => [ - { label => 'ssid', value => 'total_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ssid', value => 'total', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/ruckus/scg/snmp/mode/apusage.pm b/network/ruckus/scg/snmp/mode/apusage.pm index 3121ab6f0..92292ea1a 100644 --- a/network/ruckus/scg/snmp/mode/apusage.pm +++ b/network/ruckus/scg/snmp/mode/apusage.pm @@ -38,28 +38,28 @@ sub set_counters { key_values => [ { name => 'ruckusSCGAPNumSta' }, { name => 'display' } ], output_template => 'Users count: %s', perfdatas => [ - { label => 'users_count', value => 'ruckusSCGAPNumSta_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'users_count', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'ruckusSCGAPRXBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'ruckusSCGAPRXBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'ruckusSCGAPRXBytes_absolute', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%s', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'ruckusSCGAPTXBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'ruckusSCGAPTXBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'ruckusSCGAPTXBytes_absolute', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%s', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -77,10 +77,9 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); return $self; } diff --git a/network/ruckus/scg/snmp/mode/ssidusage.pm b/network/ruckus/scg/snmp/mode/ssidusage.pm index f48a57a70..c69b524f0 100644 --- a/network/ruckus/scg/snmp/mode/ssidusage.pm +++ b/network/ruckus/scg/snmp/mode/ssidusage.pm @@ -38,28 +38,28 @@ sub set_counters { key_values => [ { name => 'ruckusSCGWLANNumSta' }, { name => 'display' } ], output_template => 'Users count: %s', perfdatas => [ - { label => 'users_count', value => 'ruckusSCGWLANNumSta_absolute', template => '%s', - unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'users_count', template => '%s', + unit => 'users', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', set => { - key_values => [ { name => 'ruckusSCGWLANRxBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'ruckusSCGWLANRxBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'ruckusSCGWLANRxBytes_absolute', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%s', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'ruckusSCGWLANTxBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'ruckusSCGWLANTxBytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'ruckusSCGWLANTxBytes_absolute', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%s', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -77,10 +77,9 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); return $self; } diff --git a/network/ruckus/scg/snmp/mode/systemstats.pm b/network/ruckus/scg/snmp/mode/systemstats.pm index 6af6465df..c454ae156 100644 --- a/network/ruckus/scg/snmp/mode/systemstats.pm +++ b/network/ruckus/scg/snmp/mode/systemstats.pm @@ -38,8 +38,7 @@ sub set_counters { key_values => [ { name => 'ruckusSystemStatsNumAP' } ], output_template => 'APs count: %s', perfdatas => [ - { label => 'aps_count', value => 'ruckusSystemStatsNumAP_absolute', template => '%s', - unit => 'aps', min => 0 }, + { label => 'aps_count', template => '%s', unit => 'aps', min => 0 }, ], } }, @@ -47,88 +46,73 @@ sub set_counters { key_values => [ { name => 'ruckusSystemStatsNumSta' } ], output_template => 'Users count: %s', perfdatas => [ - { label => 'users_count', value => 'ruckusSystemStatsNumSta_absolute', template => '%s', - unit => 'users', min => 0 }, + { label => 'users_count', template => '%s', unit => 'users', min => 0 }, ], } }, { label => 'total-traffic-in', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalRxBytes', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalRxBytes', per_second => 1 } ], output_template => 'Total Traffic In: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'total_traffic_in', value => 'ruckusSystemStatsWLANTotalRxBytes_absolute', template => '%s', - min => 0, unit => 'b/s' }, + { label => 'total_traffic_in', template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'total-traffic-out', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalTxBytes', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalTxBytes', per_second => 1 } ], output_template => 'Total Traffic Out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'total_traffic_out', value => 'ruckusSystemStatsWLANTotalTxBytes_absolute', template => '%s', - min => 0, unit => 'b/s' }, + { label => 'total_traffic_out', template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'total-packets-in', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalRxPkts', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalRxPkts', per_second => 1 } ], output_template => 'Total Packets In: %s packets/s', - per_second => 1, perfdatas => [ - { label => 'total_packets_in', value => 'ruckusSystemStatsWLANTotalRxPkts_absolute', template => '%s', - min => 0, unit => 'packets/s' }, + { label => 'total_packets_in', template => '%s', min => 0, unit => 'packets/s' }, ], } }, { label => 'total-mcast-packets-in', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalRxMulticast', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalRxMulticast', per_second => 1 } ], output_template => 'Total Multicast Packets In: %s packets/s', - per_second => 1, perfdatas => [ - { label => 'total_mcast_packets_in', value => 'ruckusSystemStatsWLANTotalRxMulticast_absolute', template => '%s', - min => 0, unit => 'packets/s' }, + { label => 'total_mcast_packets_in', template => '%s', min => 0, unit => 'packets/s' }, ], } }, { label => 'total-packets-out', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalTxPkts', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalTxPkts', per_second => 1 } ], output_template => 'Total Packets Out: %s packets/s', - per_second => 1, perfdatas => [ - { label => 'total_packets_out', value => 'ruckusSystemStatsWLANTotalTxPkts_absolute', template => '%s', - min => 0, unit => 'packets/s' }, + { label => 'total_packets_out', template => '%s', min => 0, unit => 'packets/s' }, ], } }, { label => 'total-mcast-packets-out', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalTxMulticast', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalTxMulticast', per_second => 1 } ], output_template => 'Total Multicast Packets Out: %s packets/s', - per_second => 1, perfdatas => [ - { label => 'total_mcast_packets_out', value => 'ruckusSystemStatsWLANTotalTxMulticast_absolute', template => '%s', - min => 0, unit => 'packets/s' }, + { label => 'total_mcast_packets_out', template => '%s', min => 0, unit => 'packets/s' }, ], } }, { label => 'total-fail-packets-out', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalTxFail', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalTxFail', per_second => 1 } ], output_template => 'Total Fail Packets Out: %s packets/s', - per_second => 1, perfdatas => [ - { label => 'total_fail_packets_out', value => 'ruckusSystemStatsWLANTotalTxFail_absolute', template => '%s', - min => 0, unit => 'packets/s' }, + { label => 'total_fail_packets_out', template => '%s', min => 0, unit => 'packets/s' }, ], } }, { label => 'total-retry-packets-out', set => { - key_values => [ { name => 'ruckusSystemStatsWLANTotalTxRetry', diff => 1 } ], + key_values => [ { name => 'ruckusSystemStatsWLANTotalTxRetry', per_second => 1 } ], output_template => 'Total Retry Packets Out: %s packets/s', - per_second => 1, perfdatas => [ - { label => 'total_retry_packets_out', value => 'ruckusSystemStatsWLANTotalTxRetry_absolute', template => '%s', - min => 0, unit => 'packets/s' }, + { label => 'total_retry_packets_out', template => '%s', min => 0, unit => 'packets/s' }, ], } }, @@ -140,9 +124,8 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - }); + $options{options}->add_options(arguments => { + }); return $self; } diff --git a/network/ruckus/smartzone/snmp/mode/accesspoints.pm b/network/ruckus/smartzone/snmp/mode/accesspoints.pm index 15d0cf6af..d67ab5b67 100644 --- a/network/ruckus/smartzone/snmp/mode/accesspoints.pm +++ b/network/ruckus/smartzone/snmp/mode/accesspoints.pm @@ -83,7 +83,7 @@ sub set_counters { key_values => [ { name => 'authorized_clients' }, { name => 'display' } ], output_template => 'client devices authorized connections: %d', perfdatas => [ - { value => 'authorized_clients_absolute', template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -91,22 +91,20 @@ sub set_counters { $self->{maps_counters}->{traffic} = [ { label => 'traffic-in', nlabel => 'accesspoint.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-out', nlabel => 'accesspoint.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/network/ruckus/smartzone/snmp/mode/system.pm b/network/ruckus/smartzone/snmp/mode/system.pm index 42f89bb79..9433a9075 100644 --- a/network/ruckus/smartzone/snmp/mode/system.pm +++ b/network/ruckus/smartzone/snmp/mode/system.pm @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'ap' } ], output_template => 'access points connections: %d', perfdatas => [ - { value => 'ap_absolute', template => '%d', min => 0 } + { template => '%d', min => 0 } ] } }, @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'authorized_clients' } ], output_template => 'client devices authorized connections: %d', perfdatas => [ - { value => 'authorized_clients_absolute', template => '%d', min => 0 } + { template => '%d', min => 0 } ] } } @@ -66,22 +66,20 @@ sub set_counters { $self->{maps_counters}->{traffic} = [ { label => 'traffic-in', nlabel => 'system.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 } ], + key_values => [ { name => 'traffic_in', per_second => 1 } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s' } + { template => '%s', min => 0, unit => 'b/s' } ] } }, { label => 'traffic-out', nlabel => 'system.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 } ], + key_values => [ { name => 'traffic_out', per_second => 1 } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s' } + { template => '%s', min => 0, unit => 'b/s' } ] } } diff --git a/network/ruckus/zonedirector/snmp/mode/accesspoints.pm b/network/ruckus/zonedirector/snmp/mode/accesspoints.pm index cff5240fe..ff5f71460 100644 --- a/network/ruckus/zonedirector/snmp/mode/accesspoints.pm +++ b/network/ruckus/zonedirector/snmp/mode/accesspoints.pm @@ -52,11 +52,11 @@ sub custom_usage_output { return sprintf( 'ram total: %s %s used: %s %s (%.2f%%) free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -92,8 +92,7 @@ sub set_counters { key_values => [ { name => 'cpu_util' }, { name => 'display' } ], output_template => 'cpu usage: %.2f%%', perfdatas => [ - { value => 'cpu_util_absolute', template => '%.2f', unit => '%', - min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%.2f', unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -104,8 +103,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -113,8 +111,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -122,8 +119,7 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'ram used: %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, - label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%.2f', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -134,7 +130,7 @@ sub set_counters { key_values => [ { name => 'ap' }, { name => 'display' } ], output_template => 'access points connections: %d', perfdatas => [ - { value => 'ap_absolute', template => '%d', min => 0 } + { template => '%d', min => 0 } ] } }, @@ -142,7 +138,7 @@ sub set_counters { key_values => [ { name => 'authorized_clients' }, { name => 'display' } ], output_template => 'client devices authorized connections: %d', perfdatas => [ - { value => 'authorized_clients_absolute', template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -150,7 +146,7 @@ sub set_counters { key_values => [ { name => 'rogues' }, { name => 'display' } ], output_template => 'rogue devices connections: %d', perfdatas => [ - { value => 'rogues_absolute', template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -158,22 +154,20 @@ sub set_counters { $self->{maps_counters}->{traffic} = [ { label => 'traffic-in', nlabel => 'accesspoint.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } }, { label => 'traffic-out', nlabel => 'accesspoint.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' } + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/network/ruckus/zonedirector/snmp/mode/system.pm b/network/ruckus/zonedirector/snmp/mode/system.pm index 54f0886a6..a73240834 100644 --- a/network/ruckus/zonedirector/snmp/mode/system.pm +++ b/network/ruckus/zonedirector/snmp/mode/system.pm @@ -47,11 +47,11 @@ sub custom_usage_output { return sprintf( 'ram total: %s %s used: %s %s (%.2f%%) free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'cpu_util' } ], output_template => 'cpu usage: %.2f%%', perfdatas => [ - { value => 'cpu_util_absolute', template => '%.2f', unit => '%', min => 0, max => 100 } + { template => '%.2f', unit => '%', min => 0, max => 100 } ] } } @@ -98,8 +98,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1 } + { template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } }, @@ -107,8 +106,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1 } + { template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } }, @@ -116,7 +114,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'ram used: %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100 } + { template => '%.2f', min => 0, max => 100 } ] } } @@ -127,7 +125,7 @@ sub set_counters { key_values => [ { name => 'ap' } ], output_template => 'access points connections: %d', perfdatas => [ - { value => 'ap_absolute', template => '%d', min => 0 } + { template => '%d', min => 0 } ] } }, @@ -135,7 +133,7 @@ sub set_counters { key_values => [ { name => 'authorized_clients' } ], output_template => 'client devices authorized connections: %d', perfdatas => [ - { value => 'authorized_clients_absolute', template => '%d', min => 0 } + { template => '%d', min => 0 } ] } }, @@ -143,7 +141,7 @@ sub set_counters { key_values => [ { name => 'rogues' } ], output_template => 'rogue devices connections: %d', perfdatas => [ - { value => 'rogues_absolute', template => '%d', min => 0 } + { template => '%d', min => 0 } ] } } @@ -151,22 +149,20 @@ sub set_counters { $self->{maps_counters}->{traffic} = [ { label => 'traffic-in', nlabel => 'system.traffic.in.bitspersecond', set => { - key_values => [ { name => 'traffic_in', diff => 1 } ], + key_values => [ { name => 'traffic_in', per_second => 1 } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s' } + { template => '%s', min => 0, unit => 'b/s' } ] } }, { label => 'traffic-out', nlabel => 'system.traffic.out.bitspersecond', set => { - key_values => [ { name => 'traffic_out', diff => 1 } ], + key_values => [ { name => 'traffic_out', per_second => 1 } ], output_template => 'traffic in: %s%s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s' } + { template => '%s', min => 0, unit => 'b/s' } ] } } diff --git a/network/sonicwall/snmp/mode/connections.pm b/network/sonicwall/snmp/mode/connections.pm index 83eea9734..0920ca06a 100644 --- a/network/sonicwall/snmp/mode/connections.pm +++ b/network/sonicwall/snmp/mode/connections.pm @@ -36,8 +36,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'total' }, { name => 'used' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'connections', value => 'used_absolute', template => '%s', - min => 0, max => 'total_absolute', threshold_total => 'total_absolute', cast_int => 1 }, + { label => 'connections', value => 'used', template => '%s', + min => 0, max => 'total', threshold_total => 'total', cast_int => 1 }, ], } }, @@ -48,9 +48,9 @@ sub custom_usage_output { my ($self, %options) = @_; my $msg = sprintf("%.2f%% of the connections cached are used (%d of max. %d)", - $self->{result_values}->{prct_used_absolute}, - $self->{result_values}->{used_absolute}, - $self->{result_values}->{total_absolute}); + $self->{result_values}->{prct_used}, + $self->{result_values}->{used}, + $self->{result_values}->{total}); return $msg; } diff --git a/network/sonicwall/snmp/mode/cpu.pm b/network/sonicwall/snmp/mode/cpu.pm index a81fd6fac..9bee586e8 100644 --- a/network/sonicwall/snmp/mode/cpu.pm +++ b/network/sonicwall/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'CPU Usage %.2f %%', perfdatas => [ - { label => 'cpu', value => 'prct_used_absolute', template => '%.2f', + { label => 'cpu', value => 'prct_used', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/network/sonicwall/snmp/mode/memory.pm b/network/sonicwall/snmp/mode/memory.pm index dee952bd4..a5ab9c83f 100644 --- a/network/sonicwall/snmp/mode/memory.pm +++ b/network/sonicwall/snmp/mode/memory.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Memory Usage %.2f %%', perfdatas => [ - { label => 'memory', value => 'prct_used_absolute', template => '%.2f', + { label => 'memory', value => 'prct_used', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/network/sonicwall/snmp/mode/vpn.pm b/network/sonicwall/snmp/mode/vpn.pm index 2fabd6b4e..25d84478f 100644 --- a/network/sonicwall/snmp/mode/vpn.pm +++ b/network/sonicwall/snmp/mode/vpn.pm @@ -35,22 +35,22 @@ sub set_counters { $self->{maps_counters}->{vpn} = [ { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', + min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } } @@ -68,10 +68,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); + return $self; } diff --git a/network/sonus/sbc/snmp/mode/callstats.pm b/network/sonus/sbc/snmp/mode/callstats.pm index a4211c776..0ae61737f 100644 --- a/network/sonus/sbc/snmp/mode/callstats.pm +++ b/network/sonus/sbc/snmp/mode/callstats.pm @@ -38,58 +38,53 @@ sub set_counters { key_values => [ { name => 'current' }, { name => 'display' } ], output_template => 'Current calls : %s', perfdatas => [ - { label => 'current', value => 'current_absolute', template => '%d', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current', template => '%d', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'total-per-sec', set => { - key_values => [ { name => 'total', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'total', per_second => 1 }, { name => 'display' } ], output_template => 'total calls: %.2f/s', perfdatas => [ - { label => 'total', value => 'total_per_second', template => '%.2f', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total', template => '%.2f', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'connected-per-sec', set => { - key_values => [ { name => 'connected', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'connected', per_second => 1 }, { name => 'display' } ], output_template => 'connected calls: %.2f/s', perfdatas => [ - { label => 'connected', value => 'connected_per_second', template => '%.2f', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'connected', template => '%.2f', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'refused-per-sec', set => { - key_values => [ { name => 'refused', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'refused', per_second => 1 }, { name => 'display' } ], output_template => 'refused calls: %.2f/s', perfdatas => [ - { label => 'refused', value => 'refused_per_second', template => '%.2f', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'refused', template => '%.2f', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'errored-per-sec', set => { - key_values => [ { name => 'errored', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'errored', per_second => 1 }, { name => 'display' } ], output_template => 'errored calls: %.2f/s', perfdatas => [ - { label => 'errored', value => 'errored_per_second', template => '%.2f', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'errored', template => '%.2f', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'blocked-per-sec', set => { - key_values => [ { name => 'blocked', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'blocked', per_second => 1 }, { name => 'display' } ], output_template => 'blocked calls: %.2f/s', perfdatas => [ - { label => 'blocked', value => 'blocked_per_second', template => '%.2f', - min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'blocked', template => '%.2f', + min => 0, unit => 'calls', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -107,9 +102,9 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - }); + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/network/sonus/sbc/snmp/mode/channels.pm b/network/sonus/sbc/snmp/mode/channels.pm index fe66f43ed..ce850e305 100644 --- a/network/sonus/sbc/snmp/mode/channels.pm +++ b/network/sonus/sbc/snmp/mode/channels.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total channels : %s', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', min => 0 }, ], } @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'outofservice' } ], output_template => 'OutOfService : %s', perfdatas => [ - { label => 'total_outofservice', value => 'outofservice_absolute', template => '%s', + { label => 'total_outofservice', value => 'outofservice', template => '%s', min => 0 }, ], } @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'idle' } ], output_template => 'Idle : %s', perfdatas => [ - { label => 'total_idle', value => 'idle_absolute', template => '%s', + { label => 'total_idle', value => 'idle', template => '%s', min => 0 }, ], } @@ -87,7 +87,7 @@ sub set_counters { key_values => [ { name => 'pending' } ], output_template => 'Pending : %s', perfdatas => [ - { label => 'total_pending', value => 'pending_absolute', template => '%s', + { label => 'total_pending', value => 'pending', template => '%s', min => 0 }, ], } @@ -96,7 +96,7 @@ sub set_counters { key_values => [ { name => 'waitingforroute' } ], output_template => 'WaitingForRoute : %s', perfdatas => [ - { label => 'total_waitingforroute', value => 'waitingforroute_absolute_absolute', template => '%s', + { label => 'total_waitingforroute', value => 'waitingforroute', template => '%s', min => 0 }, ], } @@ -105,7 +105,7 @@ sub set_counters { key_values => [ { name => 'actionlist' } ], output_template => 'ActionList : %s', perfdatas => [ - { label => 'total_actionlist', value => 'actionlist_absolute', template => '%s', + { label => 'total_actionlist', value => 'actionlist', template => '%s', min => 0 }, ], } @@ -114,7 +114,7 @@ sub set_counters { key_values => [ { name => 'waitingfordigits' } ], output_template => 'WaitingForDigits : %s', perfdatas => [ - { label => 'total_waitingfordigits', value => 'waitingfordigits_absolute', template => '%s', + { label => 'total_waitingfordigits', value => 'waitingfordigits', template => '%s', min => 0 }, ], } @@ -123,7 +123,7 @@ sub set_counters { key_values => [ { name => 'remotesetup' } ], output_template => 'RemoteSetup : %s', perfdatas => [ - { label => 'total_remotesetup', value => 'remotesetup_absolute', template => '%s', + { label => 'total_remotesetup', value => 'remotesetup', template => '%s', min => 0 }, ], } @@ -132,7 +132,7 @@ sub set_counters { key_values => [ { name => 'peersetup' } ], output_template => 'PeerSetup : %s', perfdatas => [ - { label => 'total_peersetup', value => 'peersetup_absolute', template => '%s', + { label => 'total_peersetup', value => 'peersetup', template => '%s', min => 0 }, ], } @@ -141,7 +141,7 @@ sub set_counters { key_values => [ { name => 'alerting' } ], output_template => 'Alerting : %s', perfdatas => [ - { label => 'total_alerting', value => 'alerting_absolute', template => '%s', + { label => 'total_alerting', value => 'alerting', template => '%s', min => 0 }, ], } @@ -150,7 +150,7 @@ sub set_counters { key_values => [ { name => 'inbandinfo' } ], output_template => 'InBandInfo : %s', perfdatas => [ - { label => 'total_inbandinfo', value => 'inbandinfo_absolute', template => '%s', + { label => 'total_inbandinfo', value => 'inbandinfo', template => '%s', min => 0 }, ], } @@ -159,7 +159,7 @@ sub set_counters { key_values => [ { name => 'connected' } ], output_template => 'Connected : %s', perfdatas => [ - { label => 'total_connected', value => 'connected_absolute', template => '%s', + { label => 'total_connected', value => 'connected', template => '%s', min => 0 }, ], } @@ -168,7 +168,7 @@ sub set_counters { key_values => [ { name => 'tonegeneration' } ], output_template => 'ToneGeneration : %s', perfdatas => [ - { label => 'total_tonegeneration', value => 'tonegeneration_absolute', template => '%s', + { label => 'total_tonegeneration', value => 'tonegeneration', template => '%s', min => 0 }, ], } @@ -177,7 +177,7 @@ sub set_counters { key_values => [ { name => 'releasing' } ], output_template => 'Releasing : %s', perfdatas => [ - { label => 'total_releasing', value => 'releasing_absolute', template => '%s', + { label => 'total_releasing', value => 'releasing', template => '%s', min => 0 }, ], } @@ -186,7 +186,7 @@ sub set_counters { key_values => [ { name => 'aborting' } ], output_template => 'Aborting : %s', perfdatas => [ - { label => 'total_aborting', value => 'aborting_absolute', template => '%s', + { label => 'total_aborting', value => 'aborting', template => '%s', min => 0 }, ], } @@ -195,7 +195,7 @@ sub set_counters { key_values => [ { name => 'resetting' } ], output_template => 'Resetting : %s', perfdatas => [ - { label => 'total_resetting', value => 'resetting_absolute', template => '%s', + { label => 'total_resetting', value => 'resetting', template => '%s', min => 0 }, ], } @@ -204,7 +204,7 @@ sub set_counters { key_values => [ { name => 'up' } ], output_template => 'Up : %s', perfdatas => [ - { label => 'total_up', value => 'up_absolute', template => '%s', + { label => 'total_up', value => 'up', template => '%s', min => 0 }, ], } @@ -213,7 +213,7 @@ sub set_counters { key_values => [ { name => 'down' } ], output_template => 'Down : %s', perfdatas => [ - { label => 'total_down', value => 'down_absolute', template => '%s', + { label => 'total_down', value => 'down', template => '%s', min => 0 }, ], } @@ -233,8 +233,8 @@ sub set_counters { key_values => [ { name => 'seconds' }, { name => 'display' } ], output_template => 'lifetime : %s seconds', perfdatas => [ - { label => 'seconds', value => 'seconds_absolute', template => '%s', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'seconds', value => 'seconds', template => '%s', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/sonus/sbc/snmp/mode/dspstats.pm b/network/sonus/sbc/snmp/mode/dspstats.pm index 971979ecb..1c57ef6d6 100644 --- a/network/sonus/sbc/snmp/mode/dspstats.pm +++ b/network/sonus/sbc/snmp/mode/dspstats.pm @@ -60,8 +60,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'display' } ], output_template => 'CPU Usage: %s', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%d', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'cpu', template => '%d', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -69,8 +69,8 @@ sub set_counters { key_values => [ { name => 'channels' }, { name => 'display' } ], output_template => 'Active Channels: %s', perfdatas => [ - { label => 'channels', value => 'channels_absolute', template => '%d', - min => 0, unit => 'channels', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'channels', value => 'channels', template => '%d', + min => 0, unit => 'channels', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/sophos/es/snmp/mode/message.pm b/network/sophos/es/snmp/mode/message.pm index a9c3434cd..0b132da25 100644 --- a/network/sophos/es/snmp/mode/message.pm +++ b/network/sophos/es/snmp/mode/message.pm @@ -39,49 +39,45 @@ sub set_counters { key_values => [ { name => 'queue' } ], output_template => 'Current Queue : %s', perfdatas => [ - { label => 'queue', value => 'queue_absolute', template => '%s', min => 0 }, - ], + { label => 'queue', template => '%s', min => 0 } + ] } }, { label => 'total-msg-in', set => { - key_values => [ { name => 'total_in', diff => 1 } ], - output_template => 'Total Message In : %.2f/s', per_second => 1, + key_values => [ { name => 'total_in', per_second => 1 } ], + output_template => 'Total Message In : %.2f/s', perfdatas => [ - { label => 'total_msg_in', value => 'total_in_per_second', template => '%.2f', - unit => '/s', min => 0 }, - ], + { label => 'total_msg_in', template => '%.2f', unit => '/s', min => 0 } + ] } }, { label => 'total-msg-out', set => { - key_values => [ { name => 'total_out', diff => 1 } ], - output_template => 'Total Message Out : %.2f/s', per_second => 1, + key_values => [ { name => 'total_out', per_second => 1 } ], + output_template => 'Total Message Out : %.2f/s', perfdatas => [ - { label => 'total_msg_out', value => 'total_out_per_second', template => '%.2f', - unit => '/s', min => 0 }, - ], + { label => 'total_msg_out', template => '%.2f', unit => '/s', min => 0 } + ] } - }, + } ]; $self->{maps_counters}->{sea_msg} = [ { label => 'msg-in', set => { - key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], - output_template => 'In : %.2f/s', per_second => 1, + key_values => [ { name => 'in', per_second => 1 }, { name => 'display' } ], + output_template => 'In : %.2f/s', perfdatas => [ - { label => 'msg_in', value => 'in_per_second', template => '%.2f', - unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'msg_in', template => '%.2f', unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } }, { label => 'msg-out', set => { - key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], - output_template => 'Out : %.2f/s', per_second => 1, + key_values => [ { name => 'out', per_second => 1 }, { name => 'display' } ], + output_template => 'Out : %.2f/s', perfdatas => [ - { label => 'msg_out', value => 'out_per_second', template => '%.2f', - unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, - ], + { label => 'msg_out', template => '%.2f', unit => '/s', min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } - }, + } ]; } diff --git a/network/stonesoft/snmp/mode/connections.pm b/network/stonesoft/snmp/mode/connections.pm index 0a9127d30..c09c6f683 100644 --- a/network/stonesoft/snmp/mode/connections.pm +++ b/network/stonesoft/snmp/mode/connections.pm @@ -38,21 +38,18 @@ sub set_counters { key_values => [ { name => 'fwConnNumber', diff => 1 } ], output_template => 'Connections : %s', perfdatas => [ - { label => 'connections', value => 'fwConnNumber_absolute', template => '%s', - unit => 'con', min => 0 }, + { label => 'connections', template => '%s', unit => 'con', min => 0 }, ], } }, { label => 'rate-connections', nlabel => 'connections.total.persecond', set => { - key_values => [ { name => 'fwConnNumber', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'fwConnNumber', per_second => 1 } ], output_template => 'Rate Connections : %.2f /s', perfdatas => [ - { label => 'rate_connections', value => 'fwConnNumber_per_second', template => '%.2f', - unit => 'con/s', min => 0 }, + { label => 'rate_connections', template => '%.2f', unit => 'con/s', min => 0 } ], } - }, + } ]; } @@ -60,7 +57,7 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - + $options{options}->add_options(arguments => { }); diff --git a/network/stonesoft/snmp/mode/droppedpackets.pm b/network/stonesoft/snmp/mode/droppedpackets.pm index 11b46aae1..f346379ea 100644 --- a/network/stonesoft/snmp/mode/droppedpackets.pm +++ b/network/stonesoft/snmp/mode/droppedpackets.pm @@ -93,17 +93,17 @@ sub run { $time_delta = 1; } - my $dropped_absolute = $new_datas->{dropped_packets} - $old_datas->{old_dropped_packets}; - my $dropped_absolute_per_sec = $dropped_absolute / $time_delta; + my $dropped = $new_datas->{dropped_packets} - $old_datas->{old_dropped_packets}; + my $dropped_per_sec = $dropped / $time_delta; - my $exit = $self->{perfdata}->threshold_check(value => $dropped_absolute_per_sec, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); + my $exit = $self->{perfdata}->threshold_check(value => $dropped_per_sec, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); $self->{output}->output_add(severity => $exit, short_msg => sprintf("Packets Dropped : %.2f /s [%i packets]", - $dropped_absolute_per_sec, $dropped_absolute)); + $dropped_per_sec, $dropped)); $self->{output}->perfdata_add(label => 'dropped_packets_per_sec', - value => sprintf("%.2f", $dropped_absolute_per_sec), + value => sprintf("%.2f", $dropped_per_sec), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'), min => 0); diff --git a/network/stonesoft/snmp/mode/rejectedpackets.pm b/network/stonesoft/snmp/mode/rejectedpackets.pm index 8f92ac917..ce320b51b 100644 --- a/network/stonesoft/snmp/mode/rejectedpackets.pm +++ b/network/stonesoft/snmp/mode/rejectedpackets.pm @@ -93,17 +93,17 @@ sub run { $time_delta = 1; } - my $rejected_absolute = $new_datas->{rejected_packets} - $old_datas->{old_rejected_packets}; - my $rejected_absolute_per_sec = $rejected_absolute / $time_delta; + my $rejected = $new_datas->{rejected_packets} - $old_datas->{old_rejected_packets}; + my $rejected_per_sec = $rejected / $time_delta; - my $exit = $self->{perfdata}->threshold_check(value => $rejected_absolute_per_sec, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); + my $exit = $self->{perfdata}->threshold_check(value => $rejected_per_sec, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); $self->{output}->output_add(severity => $exit, short_msg => sprintf("Packets Rejected : %.2f /s [%i packets]", - $rejected_absolute_per_sec, $rejected_absolute)); + $rejected_per_sec, $rejected)); $self->{output}->perfdata_add(label => 'rejected_packets_per_sec', - value => sprintf("%.2f", $rejected_absolute_per_sec), + value => sprintf("%.2f", $rejected_per_sec), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'), min => 0); diff --git a/network/stormshield/local/mode/qosusage.pm b/network/stormshield/local/mode/qosusage.pm index aa0333c19..f5102a867 100644 --- a/network/stormshield/local/mode/qosusage.pm +++ b/network/stormshield/local/mode/qosusage.pm @@ -46,8 +46,8 @@ sub set_counters { output_template => 'In Peak : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in_peak', value => 'in_peak_absolute', template => '%.2f', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in_peak', value => 'in_peak', template => '%.2f', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -64,8 +64,8 @@ sub set_counters { output_template => 'Out Peak : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out_peak', value => 'out_peak_absolute', template => '%.2f', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out_peak', value => 'out_peak', template => '%.2f', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/network/stormshield/snmp/mode/connections.pm b/network/stormshield/snmp/mode/connections.pm index 4b4afa366..54b1b1441 100644 --- a/network/stormshield/snmp/mode/connections.pm +++ b/network/stormshield/snmp/mode/connections.pm @@ -34,25 +34,21 @@ sub set_counters { ]; $self->{maps_counters}->{global} = [ { label => 'udp', set => { - key_values => [ { name => 'udp', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'udp', per_second => 1 } ], output_template => 'UDP : %d connections/s', perfdatas => [ - { label => 'udp', value => 'udp_per_second', template => '%d', - min => 0, unit => 'con' }, - ], + { label => 'udp', template => '%d', min => 0, unit => 'con' } + ] } }, { label => 'tcp', set => { - key_values => [ { name => 'tcp', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'tcp', per_second => 1 } ], output_template => 'TCP : %d connections/s', perfdatas => [ - { label => 'tcp', value => 'tcp_per_second', template => '%d', - min => 0, unit => 'con' }, - ], + { label => 'tcp', template => '%d', min => 0, unit => 'con' } + ] } - }, + } ]; } @@ -61,9 +57,9 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - }); + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/network/stormshield/snmp/mode/hanodes.pm b/network/stormshield/snmp/mode/hanodes.pm index 02dc27f9e..d108d1065 100644 --- a/network/stormshield/snmp/mode/hanodes.pm +++ b/network/stormshield/snmp/mode/hanodes.pm @@ -108,8 +108,8 @@ sub set_counters { key_values => [ { name => 'ntqHAQuality' }, { name => 'display' } ], output_template => 'health: %s%%', perfdatas => [ - { label => 'health', value => 'ntqHAQuality_absolute', template => '%d', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'health', value => 'ntqHAQuality', template => '%d', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } } diff --git a/network/stormshield/snmp/mode/vpnstatus.pm b/network/stormshield/snmp/mode/vpnstatus.pm index 0e870b45a..6b32b6cb7 100644 --- a/network/stormshield/snmp/mode/vpnstatus.pm +++ b/network/stormshield/snmp/mode/vpnstatus.pm @@ -51,18 +51,17 @@ sub set_counters { key_values => [ { name => 'ntqVPNState' } ], closure_custom_calc => $self->can('custom_status_calc'), output_template => 'status: %s', output_error_template => 'Status : %s', - output_use => 'ntqVPNState', closure_custom_perfdata => sub { return 0; }, closure_custom_threshold_check => $self->can('custom_threshold_output'), } }, { label => 'traffic', nlabel => 'vpn.traffic.bitspersecond', set => { - key_values => [ { name => 'ntqVPNBytes', diff => 1 }, { name => 'num' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'ntqVPNBytes', per_second => 1 }, { name => 'num' } ], output_template => 'traffic: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic', value => 'ntqVPNBytes_per_second', template => '%s', - unit => 'b/s', min => 0, label_extra_instance => 1, cast_int => 1, instance_use => 'num_absolute' }, + { label => 'traffic', template => '%s', + unit => 'b/s', min => 0, label_extra_instance => 1, cast_int => 1, instance_use => 'num' }, ], } }, @@ -90,10 +89,10 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-id:s" => { name => 'filter_id' }, - "filter-src-ip:s" => { name => 'filter_src_ip' }, - "filter-dst-ip:s" => { name => 'filter_dst_ip' }, - "threshold-overload:s@" => { name => 'threshold_overload' }, + 'filter-id:s' => { name => 'filter_id' }, + 'filter-src-ip:s' => { name => 'filter_src_ip' }, + 'filter-dst-ip:s' => { name => 'filter_dst_ip' }, + 'threshold-overload:s@' => { name => 'threshold_overload' }, }); return $self; diff --git a/network/teltonika/snmp/mode/system.pm b/network/teltonika/snmp/mode/system.pm index 5604db4e8..e11ce4734 100644 --- a/network/teltonika/snmp/mode/system.pm +++ b/network/teltonika/snmp/mode/system.pm @@ -58,35 +58,33 @@ sub set_counters { key_values => [ { name => 'signal' } ], output_template => 'signal strength: %s Dbm', perfdatas => [ - { value => 'signal_absolute', template => '%s', min => 0 , unit => 'Dbm' }, - ], + { template => '%s', min => 0 , unit => 'Dbm' }, + ] } }, { label => 'temperature', nlabel => 'system.temperature.celsius', display_ok => 0, set => { key_values => [ { name => 'temperature' } ], output_template => 'temperature: %s C', perfdatas => [ - { value => 'temperature_absolute', template => '%s', min => 0 , unit => 'C' }, + { template => '%s', min => 0 , unit => 'C' }, ], } }, { label => 'traffic-in', nlabel => 'system.traffic.in.bitspersecond', display_ok => 0, set => { - key_values => [ { name => 'traffic_in', diff => 1 } ], + key_values => [ { name => 'traffic_in', per_second => 1 } ], output_template => 'traffic in: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_in_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'traffic-out', nlabel => 'system.traffic.out.bitspersecond', display_ok => 0, set => { - key_values => [ { name => 'traffic_out', diff => 1 } ], + key_values => [ { name => 'traffic_out', per_second => 1 } ], output_template => 'traffic out: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'traffic_out_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { template => '%s', min => 0, unit => 'b/s' }, ], } }, @@ -94,7 +92,7 @@ sub set_counters { key_values => [ { name => 'rsrp' } ], output_template => 'signal receive power: %s Dbm', perfdatas => [ - { value => 'rsrp_absolute', template => '%s', min => 0 , unit => 'Dbm' }, + { template => '%s', min => 0 , unit => 'Dbm' }, ], } }, @@ -102,7 +100,7 @@ sub set_counters { key_values => [ { name => 'rsrq' } ], output_template => 'signal receive quality: %s Dbm', perfdatas => [ - { value => 'rsrq_absolute', template => '%s', min => 0 , unit => 'Dbm' }, + { template => '%s', min => 0 , unit => 'Dbm' }, ], } }, diff --git a/network/ucopia/wlc/snmp/mode/system.pm b/network/ucopia/wlc/snmp/mode/system.pm index dad2352fd..5ebfe22cb 100644 --- a/network/ucopia/wlc/snmp/mode/system.pm +++ b/network/ucopia/wlc/snmp/mode/system.pm @@ -48,8 +48,8 @@ sub custom_users_output { my ($self, %options) = @_; my $msg = sprintf("%d connected users (Available licence: %s)", - $self->{result_values}->{connected_users_absolute}, - $self->{result_values}->{max_users_absolute} ne '' ? $self->{result_values}->{max_users_absolute} : '-' + $self->{result_values}->{connected_users}, + $self->{result_values}->{max_users} ne '' ? $self->{result_values}->{max_users} : '-' ); return $msg; } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'connected_users' }, { name => 'max_users' } ], closure_custom_output => $self->can('custom_users_output'), perfdatas => [ - { value => 'connected_users_absolute', template => '%s', min => 0, max => 'max_users_absolute' }, + { value => 'connected_users', template => '%s', min => 0, max => 'max_users' }, ], } }, @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'connected_users_prct' } ], output_template => 'users connected: %.2f %%', perfdatas => [ - { value => 'connected_users_prct_absolute', template => '%.2f', unit => '%', min => 0, max => 100 }, + { value => 'connected_users_prct', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } }, @@ -91,7 +91,7 @@ sub set_counters { key_values => [ { name => 'disk_temperature', no_value => 0 } ], output_template => 'disk temperature: %s C', perfdatas => [ - { value => 'disk_temperature_absolute', template => '%s', unit => 'C' }, + { value => 'disk_temperature', template => '%s', unit => 'C' }, ], } }, @@ -99,7 +99,7 @@ sub set_counters { key_values => [ { name => 'cpu_temperature', no_value => 0 } ], output_template => 'cpu temperature: %s C', perfdatas => [ - { value => 'cpu_temperature_absolute', template => '%s', unit => 'C' }, + { value => 'cpu_temperature', template => '%s', unit => 'C' }, ], } }, diff --git a/network/watchguard/snmp/mode/cpu.pm b/network/watchguard/snmp/mode/cpu.pm index 6d5675d91..c1a5fce9e 100644 --- a/network/watchguard/snmp/mode/cpu.pm +++ b/network/watchguard/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => '1min' } ], output_template => '1 minute : %.2f %%', perfdatas => [ - { label => 'cpu_1min', value => '1min_absolute', template => '%.2f', + { label => 'cpu_1min', value => '1min', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => '5min' } ], output_template => '5 minutes : %.2f %%', perfdatas => [ - { label => 'cpu_5min', value => '5min_absolute', template => '%.2f', + { label => 'cpu_5min', value => '5min', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => '15min' } ], output_template => '15 minutes : %.2f %%', perfdatas => [ - { label => 'cpu_15min', value => '15min_absolute', template => '%.2f', + { label => 'cpu_15min', value => '15min', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/watchguard/snmp/mode/ipsectunnel.pm b/network/watchguard/snmp/mode/ipsectunnel.pm index 24696faa6..ce301cab9 100644 --- a/network/watchguard/snmp/mode/ipsectunnel.pm +++ b/network/watchguard/snmp/mode/ipsectunnel.pm @@ -40,30 +40,28 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total Tunnels: %s', perfdatas => [ - { label => 'total_tunnels', value => 'total_absolute', template => '%s', - min => 0 }, - ], + { template => '%s', min => 0 } + ] } - }, + } ]; + $self->{maps_counters}->{tunnel} = [ { label => 'tunnel-traffic-in', nlabel => 'ipsec.tunnel.traffic.in.bitspersecond', set => { - key_values => [ { name => 'wgIpsecTunnelInKbytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'wgIpsecTunnelInKbytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'wgIpsecTunnelInKbytes_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'tunnel-traffic-out', nlabel => 'ipsec.tunnel.traffic.out.bitspersecond', set => { - key_values => [ { name => 'wgIpsecTunnelOutKbytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'wgIpsecTunnelOutKbytes', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'wgIpsecTunnelOutKbytes_per_second', template => '%s', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -82,7 +80,7 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - 'filter-name:s' => { name => 'filter_name' }, + 'filter-name:s' => { name => 'filter_name' } }); return $self; diff --git a/network/watchguard/snmp/mode/policyusage.pm b/network/watchguard/snmp/mode/policyusage.pm index 5116a589b..8e9e8a75b 100644 --- a/network/watchguard/snmp/mode/policyusage.pm +++ b/network/watchguard/snmp/mode/policyusage.pm @@ -38,8 +38,7 @@ sub set_counters { key_values => [ { name => 'wgPolicyCurrActiveConns' }, { name => 'display' } ], output_template => 'Current connections : %s', perfdatas => [ - { label => 'current_connections', value => 'wgPolicyCurrActiveConns_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'current_connections', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,28 +46,25 @@ sub set_counters { key_values => [ { name => 'wgPolicyActiveStreams', diff => 1 }, { name => 'display' } ], output_template => 'Total connections : %s', perfdatas => [ - { label => 'total_connections', value => 'wgPolicyActiveStreams_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_connections', template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'l3-traffic', set => { - key_values => [ { name => 'wgPolicyL3PackageBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'wgPolicyL3PackageBytes', per_second => 1 }, { name => 'display' } ], output_template => 'L3 Traffic : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_l3', value => 'wgPolicyL3PackageBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_l3', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'l2-traffic', set => { - key_values => [ { name => 'wgPolicyL2PackageBytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'wgPolicyL2PackageBytes', per_second => 1 }, { name => 'display' } ], output_template => 'L2 Traffic : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_l2', value => 'wgPolicyL2PackageBytes_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_l2', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -79,12 +75,11 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - }); - + + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' } + }); + return $self; } diff --git a/network/watchguard/snmp/mode/system.pm b/network/watchguard/snmp/mode/system.pm index a7deb0872..1c67053cc 100644 --- a/network/watchguard/snmp/mode/system.pm +++ b/network/watchguard/snmp/mode/system.pm @@ -38,28 +38,25 @@ sub set_counters { key_values => [ { name => 'connections' } ], output_template => 'Current connections : %s', perfdatas => [ - { label => 'current_connections', value => 'connections_absolute', template => '%s', - min => 0 }, + { label => 'current_connections', template => '%s', min => 0 }, ], } }, { label => 'in-traffic', set => { - key_values => [ { name => 'in_traffic', diff => 1 } ], + key_values => [ { name => 'in_traffic', per_second => 1 } ], output_template => 'Traffic In : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_in', value => 'in_traffic_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { label => 'traffic_in', template => '%s', min => 0, unit => 'b/s' }, ], } }, { label => 'out-traffic', set => { - key_values => [ { name => 'out_traffic', diff => 1 } ], + key_values => [ { name => 'out_traffic', per_second => 1 } ], output_template => 'Traffic Out : %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'out_traffic_per_second', template => '%s', - min => 0, unit => 'b/s' }, + { label => 'traffic_out', template => '%s', min => 0, unit => 'b/s' }, ], } }, @@ -70,11 +67,10 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - - $options{options}->add_options(arguments => - { - }); - + + $options{options}->add_options(arguments => { + }); + return $self; } diff --git a/network/zyxel/snmp/mode/cpu.pm b/network/zyxel/snmp/mode/cpu.pm index 0746b364f..3844b351f 100644 --- a/network/zyxel/snmp/mode/cpu.pm +++ b/network/zyxel/snmp/mode/cpu.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'usage_5s' } ], output_template => '%.2f %% (5sec)', output_error_template => "%s (5sec)", perfdatas => [ - { label => 'cpu_5s', value => 'usage_5s_absolute', template => '%.2f', + { label => 'cpu_5s', value => 'usage_5s', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'usage_1m' } ], output_template => '%.2f %% (1m)', output_error_template => "%s (1min)", perfdatas => [ - { label => 'cpu_1m', value => 'usage_1m_absolute', template => '%.2f', + { label => 'cpu_1m', value => 'usage_1m', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'usage_5m' } ], output_template => '%.2f %% (5min)', output_error_template => "%s (5min)", perfdatas => [ - { label => 'cpu_5m', value => 'usage_5m_absolute', template => '%.2f', + { label => 'cpu_5m', value => 'usage_5m', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/network/zyxel/snmp/mode/memory.pm b/network/zyxel/snmp/mode/memory.pm index 33f149105..fe1db266f 100644 --- a/network/zyxel/snmp/mode/memory.pm +++ b/network/zyxel/snmp/mode/memory.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'ram_used' } ], output_template => 'Memory Used: %.2f%%', perfdatas => [ - { label => 'memory_used', value => 'ram_used_absolute', template => '%.2f', + { label => 'memory_used', value => 'ram_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'flash_used' } ], output_template => 'Flash Used: %.2f%%', perfdatas => [ - { label => 'flash_used', value => 'flash_used_absolute', template => '%.2f', + { label => 'flash_used', value => 'flash_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/network/zyxel/snmp/mode/sessions.pm b/network/zyxel/snmp/mode/sessions.pm index 871522364..678306188 100644 --- a/network/zyxel/snmp/mode/sessions.pm +++ b/network/zyxel/snmp/mode/sessions.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'sessions' } ], output_template => 'Current active sessions : %s', perfdatas => [ - { label => 'sessions', value => 'sessions_absolute', template => '%s', min => 0 }, + { label => 'sessions', value => 'sessions', template => '%s', min => 0 }, ], } }, diff --git a/network/zyxel/snmp/mode/vpnstatus.pm b/network/zyxel/snmp/mode/vpnstatus.pm index c48504492..ff45d6f14 100644 --- a/network/zyxel/snmp/mode/vpnstatus.pm +++ b/network/zyxel/snmp/mode/vpnstatus.pm @@ -60,22 +60,19 @@ sub set_counters { } }, { label => 'traffic-in', set => { - key_values => [ { name => 'traffic_in', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_in', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In: %s %s/s', perfdatas => [ - { label => 'traffic_in', value => 'traffic_in_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_in', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-out', set => { - key_values => [ { name => 'traffic_out', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'traffic_out', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out: %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'traffic_out_per_second', template => '%.2f', - min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%.2f', min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display' }, ], } } @@ -93,12 +90,12 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-name:s" => { name => 'filter_name' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{connectstatus} eq "disconnected"' }, - }); + $options{options}->add_options(arguments => { + 'filter-name:s' => { name => 'filter_name' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{connectstatus} eq "disconnected"' } + }); + return $self; } diff --git a/os/aix/local/mode/inodes.pm b/os/aix/local/mode/inodes.pm index d350a6f2d..41edea786 100644 --- a/os/aix/local/mode/inodes.pm +++ b/os/aix/local/mode/inodes.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'display' } ], output_template => 'Used: %s %%', perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/os/aix/local/mode/process.pm b/os/aix/local/mode/process.pm index ced007f47..8bab5d2a1 100644 --- a/os/aix/local/mode/process.pm +++ b/os/aix/local/mode/process.pm @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Number of current processes: %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 }, + { value => 'total', template => '%s', min => 0 }, ], } }, diff --git a/os/aix/snmp/mode/swap.pm b/os/aix/snmp/mode/swap.pm index f0678df34..87cf893a4 100644 --- a/os/aix/snmp/mode/swap.pm +++ b/os/aix/snmp/mode/swap.pm @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'nactive' }, { name => 'ntotal' } ], output_template => 'Total page space active : %s', perfdatas => [ - { label => 'total_active', value => 'nactive_absolute', template => '%s', + { label => 'total_active', value => 'nactive', template => '%s', min => 0, max => 'ntotal' }, ], } diff --git a/os/hpux/local/mode/inodes.pm b/os/hpux/local/mode/inodes.pm index 0664f8733..120376fae 100644 --- a/os/hpux/local/mode/inodes.pm +++ b/os/hpux/local/mode/inodes.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'display' } ], output_template => 'Used: %s %%', perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/os/linux/local/mode/directlvmusage.pm b/os/linux/local/mode/directlvmusage.pm index 81e8160d2..216c496c9 100644 --- a/os/linux/local/mode/directlvmusage.pm +++ b/os/linux/local/mode/directlvmusage.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'data' }, { name => 'display' } ], output_template => 'Data Usage : %.2f %%', perfdatas => [ - { label => 'data_used', value => 'data_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'data_used', value => 'data', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'meta' }, { name => 'display' } ], output_template => 'Meta Usage : %.2f %%', perfdatas => [ - { label => 'meta_used', value => 'meta_absolute', template => '%.2f', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'meta_used', value => 'meta', template => '%.2f', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/os/linux/local/mode/diskio.pm b/os/linux/local/mode/diskio.pm index 5aa7d4c08..085b360f6 100644 --- a/os/linux/local/mode/diskio.pm +++ b/os/linux/local/mode/diskio.pm @@ -69,7 +69,7 @@ sub set_counters { key_values => [ { name => 'read_sectors', diff => 1 }, { name => 'display' } ], closure_custom_calc => $self->can('custom_usage_calc'), closure_custom_calc_extra_options => { label_ref => 'read' }, output_template => 'read I/O : %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, output_use => 'usage_persecond', threshold_use => 'usage_persecond', perfdatas => [ { label => 'readio', value => 'usage_persecond', template => '%d', @@ -81,7 +81,7 @@ sub set_counters { key_values => [ { name => 'write_sectors', diff => 1 }, { name => 'display' } ], closure_custom_calc => $self->can('custom_usage_calc'), closure_custom_calc_extra_options => { label_ref => 'write' }, output_template => 'write I/O : %s %s/s', - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, output_use => 'usage_persecond', threshold_use => 'usage_persecond', perfdatas => [ { label => 'writeio', value => 'usage_persecond', template => '%d', @@ -93,8 +93,8 @@ sub set_counters { key_values => [ { name => 'read_ms', diff => 1 }, { name => 'display' } ], output_template => 'read time : %.2f ms', perfdatas => [ - { label => 'readtime', value => 'read_ms_absolute', template => '%.2f', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'readtime', template => '%.2f', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -102,8 +102,8 @@ sub set_counters { key_values => [ { name => 'write_ms', diff => 1 }, { name => 'display' } ], output_template => 'write time : %.2f ms', perfdatas => [ - { label => 'writetime', value => 'write_ms_absolute', template => '%.2f', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'writetime', template => '%.2f', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -118,7 +118,6 @@ sub set_counters { { name => 'display' } ], closure_custom_calc => $self->can('custom_utils_calc'), - per_second => 1, output_template => '%%utils: %.2f %%', output_use => 'utils', threshold_use => 'utils', perfdatas => [ @@ -199,7 +198,7 @@ sub manage_selection { } $self->{device} = {}; - while ($disk_parts =~ /^\s*\S+\s+\S+\s+(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+)\s+\S+\s+\S+\s+(\S+)\s*$/msg) { + while ($disk_parts =~ /^\s*\S+\s+\S+\s+(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+)\s+\S+\s+\S+\s+(\S+)\s*/msg) { my ($partition_name, $read_sector, $write_sector, $read_ms, $write_ms, $ms_ticks) = ($1, $2, $4, $3, $5, $6); next if (defined($self->{option_results}->{name}) && defined($self->{option_results}->{use_regexp}) && defined($self->{option_results}->{use_regexpi}) @@ -228,7 +227,7 @@ sub manage_selection { cpu_iowait => $cpu_iowait, }; } - + if (scalar(keys %{$self->{device}}) <= 0) { if (defined($self->{option_results}->{name})) { $self->{output}->add_option_msg(short_msg => "No device found for name '" . $self->{option_results}->{name} . "'."); diff --git a/os/linux/local/mode/inodes.pm b/os/linux/local/mode/inodes.pm index 9b51a3f67..0014f110a 100644 --- a/os/linux/local/mode/inodes.pm +++ b/os/linux/local/mode/inodes.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'display' } ], output_template => 'Used: %s %%', perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/os/linux/local/mode/ntp.pm b/os/linux/local/mode/ntp.pm index ec09bdc88..dbc9e5383 100644 --- a/os/linux/local/mode/ntp.pm +++ b/os/linux/local/mode/ntp.pm @@ -101,18 +101,18 @@ sub custom_status_calc { sub custom_offset_perfdata { my ($self, %options) = @_; - if ($self->{result_values}->{state_absolute} ne '*') { + if ($self->{result_values}->{state} ne '*') { $self->{output}->perfdata_add( label => 'offset', unit => 'ms', - instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display_absolute} : undef, - value => $self->{result_values}->{offset_absolute}, + instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, + value => $self->{result_values}->{offset}, min => 0 ); } else { $self->{output}->perfdata_add( label => 'offset', unit => 'ms', - instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display_absolute} : undef, - value => $self->{result_values}->{offset_absolute}, + instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, + value => $self->{result_values}->{offset}, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}), min => 0 @@ -123,10 +123,10 @@ sub custom_offset_perfdata { sub custom_offset_threshold { my ($self, %options) = @_; - if ($self->{result_values}->{state_absolute} ne '*') { + if ($self->{result_values}->{state} ne '*') { return 'ok'; } - return $self->{perfdata}->threshold_check(value => $self->{result_values}->{offset_absolute}, threshold => [ { label => 'critical-' . $self->{thlabel}, exit_litteral => 'critical' }, { label => 'warning-'. $self->{thlabel}, exit_litteral => 'warning' } ]); + return $self->{perfdata}->threshold_check(value => $self->{result_values}->{offset}, threshold => [ { label => 'critical-' . $self->{thlabel}, exit_litteral => 'critical' }, { label => 'warning-'. $self->{thlabel}, exit_litteral => 'warning' } ]); } sub set_counters { @@ -142,7 +142,7 @@ sub set_counters { key_values => [ { name => 'peers' } ], output_template => 'Number of ntp peers : %d', perfdatas => [ - { label => 'peers', value => 'peers_absolute', template => '%d', + { label => 'peers', value => 'peers', template => '%d', min => 0 }, ], } @@ -164,8 +164,8 @@ sub set_counters { closure_custom_threshold_check => $self->can('custom_offset_threshold'), closure_custom_perfdata => $self->can('custom_offset_perfdata'), perfdatas => [ - { label => 'offset', value => 'offset_absolute', template => '%s', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'offset', value => 'offset', template => '%s', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -173,8 +173,8 @@ sub set_counters { key_values => [ { name => 'stratum' }, { name => 'display' } ], output_template => 'Stratum : %s', perfdatas => [ - { label => 'stratum', value => 'stratum_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'stratum', value => 'stratum', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/os/linux/local/mode/openfiles.pm b/os/linux/local/mode/openfiles.pm index c3c4106f5..97fa8e3f8 100644 --- a/os/linux/local/mode/openfiles.pm +++ b/os/linux/local/mode/openfiles.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'openfiles' } ], output_template => 'current open files: %s', perfdatas => [ - { value => 'openfiles_absolute', template => '%s', min => 0 }, + { value => 'openfiles', template => '%s', min => 0 }, ], } }, diff --git a/os/linux/local/mode/paging.pm b/os/linux/local/mode/paging.pm index 32bfbb1a2..caf1c231b 100644 --- a/os/linux/local/mode/paging.pm +++ b/os/linux/local/mode/paging.pm @@ -36,56 +36,56 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'pgpgin', nlabel => 'system.pgpin.usage.bytespersecond', set => { - key_values => [ { name => 'pgpgin', diff => 1 } ], - output_template => 'pgpgin : %s %s/s', per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'pgpgin', per_second => 1 } ], + output_template => 'pgpgin : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { value => 'pgpgin_per_second', label => 'pgpgin', template => '%d', - unit => 'B/s', min => 0 }, + { label => 'pgpgin', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'pgpgout', nlabel => 'system.pgpgout.usage.bytespersecond', set => { - key_values => [ { name => 'pgpgout', diff => 1 } ], - output_template => 'pgpgout : %s %s/s', per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'pgpgout', per_second => 1 } ], + output_template => 'pgpgout : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { value => 'pgpgout_per_second', label => 'pgpgout', template => '%d', - unit => 'B/s', min => 0 }, + { label => 'pgpgout', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'pswpin', nlabel => 'system.pswpin.usage.bytespersecond', set => { - key_values => [ { name => 'pswpin', diff => 1 } ], - output_template => 'pswpin : %s %s/s', per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'pswpin', per_second => 1 } ], + output_template => 'pswpin : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { value => 'pswpin_per_second', label => 'pswpin', template => '%d', - unit => 'B/s', min => 0 }, + { label => 'pswpin', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'pswpout', nlabel => 'system.pswpout.usage.bytespersecond', set => { - key_values => [ { name => 'pswpout', diff => 1 } ], - output_template => 'pswpout : %s %s/s', per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'pswpout', per_second => 1 } ], + output_template => 'pswpout : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { value => 'pswpout_per_second', label => 'pswpout', template => '%d', - unit => 'B/s', min => 0 }, + { label => 'pswpout', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'pgfault', nlabel => 'system.pgfault.usage.bytespersecond', set => { - key_values => [ { name => 'pgfault', diff => 1 } ], - output_template => 'pgfault : %s %s/s', per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'pgfault', per_second => 1 } ], + output_template => 'pgfault : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { value => 'pgfault_per_second', label => 'pgfault', template => '%d', - unit => 'B/s', min => 0 }, + { label => 'pgfault', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'pgmajfault', nlabel => 'system.pgmajfault.usage.bytespersecond', set => { - key_values => [ { name => 'pgmajfault', diff => 1 } ], - output_template => 'pgmajfault : %s %s/s', per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'pgmajfault', per_second => 1 } ], + output_template => 'pgmajfault : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { value => 'pgmajfault_per_second', label => 'pgmajfault', template => '%d', - unit => 'B/s', min => 0 }, + { label => 'pgmajfault', template => '%d', unit => 'B/s', min => 0 }, ], } }, @@ -98,16 +98,16 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, - "remote" => { name => 'remote' }, - "ssh-option:s@" => { name => 'ssh_option' }, - "ssh-path:s" => { name => 'ssh_path' }, - "ssh-command:s" => { name => 'ssh_command', default => 'ssh' }, - "timeout:s" => { name => 'timeout', default => 30 }, - "sudo" => { name => 'sudo' }, - "command:s" => { name => 'command', default => 'cat' }, - "command-path:s" => { name => 'command_path' }, - "command-options:s" => { name => 'command_options', default => '/proc/vmstat 2>&1' }, + 'hostname:s' => { name => 'hostname' }, + 'remote' => { name => 'remote' }, + 'ssh-option:s@' => { name => 'ssh_option' }, + 'ssh-path:s' => { name => 'ssh_path' }, + 'ssh-command:s' => { name => 'ssh_command', default => 'ssh' }, + 'timeout:s' => { name => 'timeout', default => 30 }, + 'sudo' => { name => 'sudo' }, + 'command:s' => { name => 'command', default => 'cat' }, + 'command-path:s' => { name => 'command_path' }, + 'command-options:s' => { name => 'command_options', default => '/proc/vmstat 2>&1' }, }); return $self; diff --git a/os/linux/local/mode/pendingupdates.pm b/os/linux/local/mode/pendingupdates.pm index bd94dc218..cf0dbfa90 100644 --- a/os/linux/local/mode/pendingupdates.pm +++ b/os/linux/local/mode/pendingupdates.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Number of pending updates : %d', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%d', + { label => 'total', value => 'total', template => '%d', min => 0 }, ], } diff --git a/os/linux/local/mode/swap.pm b/os/linux/local/mode/swap.pm index e747e7137..f5c9c4234 100644 --- a/os/linux/local/mode/swap.pm +++ b/os/linux/local/mode/swap.pm @@ -31,11 +31,11 @@ sub custom_swap_output { my $output = sprintf( 'Swap Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free}, ); return $output; } @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_swap_output'), perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', unit => 'B', cast_int => 1 }, + { label => 'used', value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], }, }, @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_swap_output'), perfdatas => [ - { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { label => 'free', value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Swap used: %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, unit => '%' }, + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], }, }, diff --git a/os/linux/local/mode/systemdscstatus.pm b/os/linux/local/mode/systemdscstatus.pm index 7340c5251..ba0d5fae6 100644 --- a/os/linux/local/mode/systemdscstatus.pm +++ b/os/linux/local/mode/systemdscstatus.pm @@ -64,8 +64,8 @@ sub set_counters { key_values => [ { name => 'running' }, { name => 'total' } ], output_template => 'Total Running: %s', perfdatas => [ - { label => 'total_running', value => 'running_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_running', value => 'running', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -73,8 +73,8 @@ sub set_counters { key_values => [ { name => 'failed' }, { name => 'total' } ], output_template => 'Total Failed: %s', perfdatas => [ - { label => 'total_failed', value => 'failed_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_failed', value => 'failed', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'dead' }, { name => 'total' } ], output_template => 'Total Dead: %s', perfdatas => [ - { label => 'total_dead', value => 'dead_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_dead', value => 'dead', template => '%s', + min => 0, max => 'total' }, ], } }, @@ -91,8 +91,8 @@ sub set_counters { key_values => [ { name => 'exited' }, { name => 'total' } ], output_template => 'Total Exited: %s', perfdatas => [ - { label => 'total_exited', value => 'exited_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'total_exited', value => 'exited', template => '%s', + min => 0, max => 'total' }, ], } }, diff --git a/os/linux/local/mode/traffic.pm b/os/linux/local/mode/traffic.pm index d7dfaf2a6..fa75d7eeb 100644 --- a/os/linux/local/mode/traffic.pm +++ b/os/linux/local/mode/traffic.pm @@ -123,7 +123,6 @@ sub set_counters { }, { label => 'in', set => { key_values => [ { name => 'in', diff => 1 }, { name => 'speed_in' }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic In : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -132,7 +131,6 @@ sub set_counters { }, { label => 'out', set => { key_values => [ { name => 'out', diff => 1 }, { name => 'speed_out' }, { name => 'display' } ], - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic Out : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), diff --git a/os/windows/local/mode/sessions.pm b/os/windows/local/mode/sessions.pm index bc597df9e..8e8260982 100644 --- a/os/windows/local/mode/sessions.pm +++ b/os/windows/local/mode/sessions.pm @@ -39,7 +39,7 @@ sub set_counters { key_values => [ { name => 'sessions_created', diff => 1 } ], output_template => 'created : %s', perfdatas => [ - { label => 'sessions_created', value => 'sessions_created_absolute', template => '%s', min => 0 }, + { label => 'sessions_created', value => 'sessions_created', template => '%s', min => 0 }, ], } }, @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'sessions_disconnected', diff => 1 } ], output_template => 'disconnected : %s', perfdatas => [ - { label => 'sessions_disconnected', value => 'sessions_disconnected_absolute', template => '%s', min => 0 }, + { label => 'sessions_disconnected', value => 'sessions_disconnected', template => '%s', min => 0 }, ], } }, @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'sessions_reconnected', diff => 1 } ], output_template => 'reconnected : %s', perfdatas => [ - { label => 'sessions_reconnected', value => 'sessions_reconnected_absolute', template => '%s', min => 0 }, + { label => 'sessions_reconnected', value => 'sessions_reconnected', template => '%s', min => 0 }, ], } }, @@ -63,7 +63,7 @@ sub set_counters { key_values => [ { name => 'sessions_active' } ], output_template => 'current active : %s', perfdatas => [ - { label => 'sessions_active', value => 'sessions_active_absolute', template => '%s', min => 0 }, + { label => 'sessions_active', value => 'sessions_active', template => '%s', min => 0 }, ], } }, @@ -71,7 +71,7 @@ sub set_counters { key_values => [ { name => 'sessions_disconnected_current' } ], output_template => 'current disconnected : %s', perfdatas => [ - { label => 'sessions_disconnected_current', value => 'sessions_disconnected_current_absolute', + { label => 'sessions_disconnected_current', value => 'sessions_disconnected_current', template => '%s', min => 0 }, ], } diff --git a/snmp_standard/mode/arp.pm b/snmp_standard/mode/arp.pm index cce5164ae..c71d91132 100644 --- a/snmp_standard/mode/arp.pm +++ b/snmp_standard/mode/arp.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'total entries %s', perfdatas => [ - { value => 'total_absolute', template => '%s', min => 0 }, + { value => 'total', template => '%s', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'duplicate_macaddress' } ], output_template => 'duplicate mac address %s', perfdatas => [ - { value => 'duplicate_macaddress_absolute', template => '%s', min => 0 }, + { value => 'duplicate_macaddress', template => '%s', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'duplicate_ipaddress' } ], output_template => 'duplicate ip address %s', perfdatas => [ - { value => 'duplicate_ipaddress_absolute', template => '%s', min => 0 }, + { value => 'duplicate_ipaddress', template => '%s', min => 0 }, ], } }, diff --git a/snmp_standard/mode/cpu.pm b/snmp_standard/mode/cpu.pm index 0c02fc807..8640fce89 100644 --- a/snmp_standard/mode/cpu.pm +++ b/snmp_standard/mode/cpu.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'average' }, { name => 'count' } ], output_template => '%.2f %%', perfdatas => [ - { label => 'total_cpu_avg', value => 'average_absolute', template => '%.2f', + { label => 'total_cpu_avg', value => 'average', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } @@ -50,8 +50,8 @@ sub set_counters { key_values => [ { name => 'cpu' }, { name => 'display' } ], output_template => 'usage : %.2f %%', perfdatas => [ - { label => 'cpu', value => 'cpu_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'cpu', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/snmp_standard/mode/diskio.pm b/snmp_standard/mode/diskio.pm index 27d702177..8d0f20979 100644 --- a/snmp_standard/mode/diskio.pm +++ b/snmp_standard/mode/diskio.pm @@ -36,41 +36,39 @@ sub set_counters { ]; $self->{maps_counters}->{global} = [ { label => 'total-read', set => { - key_values => [ { name => 'total_read', diff => 1 } ], + key_values => [ { name => 'total_read', per_second => 1 } ], output_template => 'Read I/O : %s %s/s', output_error_template => "Read I/O : %s", - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'total_read', value => 'total_read_per_second', template => '%d', + { label => 'total_read', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'total-write', set => { - key_values => [ { name => 'total_write', diff => 1 } ], + key_values => [ { name => 'total_write', per_second => 1 } ], output_template => 'Write I/O : %s %s/s', output_error_template => "Write I/O : %s", - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'total_write', value => 'total_write_per_second', template => '%d', + { label => 'total_write', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'total-read-iops', set => { - key_values => [ { name => 'total_read_iops', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'total_read_iops', per_second => 1 } ], output_template => 'Read IOPs : %.2f', output_error_template => "Read IOPs : %s", perfdatas => [ - { label => 'total_read_iops', value => 'total_read_iops_per_second', template => '%.2f', + { label => 'total_read_iops', template => '%.2f', unit => 'iops', min => 0 }, ], } }, { label => 'total-write-iops', set => { - key_values => [ { name => 'total_write_iops', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'total_write_iops', per_second => 1 } ], output_template => 'Write IOPs : %.2f', output_error_template => "Write IOPs : %s", perfdatas => [ - { label => 'total_write_iops', value => 'total_write_iops_per_second', template => '%.2f', + { label => 'total_write_iops', template => '%.2f', unit => 'iops', min => 0 }, ], } @@ -79,22 +77,20 @@ sub set_counters { $self->{maps_counters}->{sum} = [ { label => 'sum-read-write', set => { - key_values => [ { name => 'sum_read_write', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'sum_read_write', per_second => 1 } ], output_template => 'R+W I/O : %s %s/s', output_error_template => "R+W I/O : %s", output_change_bytes => 1, perfdatas => [ - { label => 'sum_read_write', value => 'sum_read_write_per_second', template => '%d', + { label => 'sum_read_write', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'sum-read-write-iops', set => { - key_values => [ { name => 'sum_read_write_iops', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'sum_read_write_iops', per_second => 1 } ], output_template => 'R+W IOPs : %.2f', output_error_template => "R+W IOPs : %s", perfdatas => [ - { label => 'sum_read_write_iops', value => 'sum_read_write_iops_per_second', template => '%.2f', + { label => 'sum_read_write_iops', template => '%.2f', unit => 'iops', min => 0 }, ], } @@ -103,42 +99,40 @@ sub set_counters { $self->{maps_counters}->{disk} = [ { label => 'read', set => { - key_values => [ { name => 'read', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'read', per_second => 1 }, { name => 'display' } ], output_template => 'Read I/O : %s %s/s', output_error_template => "Read I/O : %s", - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'read', value => 'read_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read', template => '%d', + unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write', set => { - key_values => [ { name => 'write', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'write', per_second => 1 }, { name => 'display' } ], output_template => 'Write I/O : %s %s/s', output_error_template => "Write I/O : %s", - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'write', value => 'write_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write', template => '%d', + unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-iops', set => { - key_values => [ { name => 'read_iops', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'read_iops', per_second => 1 }, { name => 'display' } ], output_template => 'Read IOPs : %.2f', output_error_template => "Read IOPs : %s", perfdatas => [ - { label => 'read_iops', value => 'read_iops_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-iops', set => { - key_values => [ { name => 'write_iops', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'write_iops', per_second => 1 }, { name => 'display' } ], output_template => 'Write IOPs : %.2f', output_error_template => "Write IOPs : %s", perfdatas => [ - { label => 'write_iops', value => 'write_iops_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -154,7 +148,7 @@ sub new { 'name' => { name => 'use_name' }, 'device:s' => { name => 'device' }, 'regexp' => { name => 'use_regexp' }, - 'regexp-isensitive' => { name => 'use_regexpi' }, + 'regexp-isensitive' => { name => 'use_regexpi' } }); return $self; diff --git a/snmp_standard/mode/diskusage.pm b/snmp_standard/mode/diskusage.pm index b51652272..f5da5b23f 100644 --- a/snmp_standard/mode/diskusage.pm +++ b/snmp_standard/mode/diskusage.pm @@ -30,14 +30,14 @@ use Digest::MD5 qw(md5_hex); sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); return sprintf( 'Usage Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free} ); } @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Partitions count : %d', perfdatas => [ - { label => 'count', value => 'count_absolute', template => '%d', min => 0 } + { label => 'count', value => 'count', template => '%d', min => 0 } ] } } @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'used', value => 'used', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'free', value => 'free', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'inodes' }, { name => 'display' } ], output_template => 'Inodes Used: %s %%', perfdatas => [ - { label => 'inodes', value => 'inodes_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'inodes', value => 'inodes', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/snmp_standard/mode/inodes.pm b/snmp_standard/mode/inodes.pm index ee844de74..5dd6b71e8 100644 --- a/snmp_standard/mode/inodes.pm +++ b/snmp_standard/mode/inodes.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'usage' }, { name => 'display' } ], output_template => 'Used: %s %%', output_error_template => "%s", perfdatas => [ - { label => 'used', value => 'usage_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'usage', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/snmp_standard/mode/interfaces.pm b/snmp_standard/mode/interfaces.pm index b46afc57b..b2b701e41 100644 --- a/snmp_standard/mode/interfaces.pm +++ b/snmp_standard/mode/interfaces.pm @@ -297,50 +297,50 @@ sub set_counters_global { { label => 'total-port', filter => 'add_global', nlabel => 'total.interfaces.count', set => { key_values => [ { name => 'total_port' } ], output_template => 'Total port : %s', output_error_template => 'Total port : %s', - output_use => 'total_port_absolute', threshold_use => 'total_port_absolute', + output_use => 'total_port', threshold_use => 'total_port', perfdatas => [ - { label => 'total_port', value => 'total_port_absolute', template => '%s', - min => 0, max => 'total_port_absolute' } + { label => 'total_port', value => 'total_port', template => '%s', + min => 0, max => 'total_port' } ] } }, { label => 'global-admin-up', filter => 'add_global', nlabel => 'total.interfaces.admin.up.count', set => { key_values => [ { name => 'global_admin_up' }, { name => 'total_port' } ], output_template => 'AdminStatus Up : %s', output_error_template => 'AdminStatus Up : %s', - output_use => 'global_admin_up_absolute', threshold_use => 'global_admin_up_absolute', + output_use => 'global_admin_up', threshold_use => 'global_admin_up', perfdatas => [ - { label => 'total_admin_up', value => 'global_admin_up_absolute', template => '%s', - min => 0, max => 'total_port_absolute' } + { label => 'total_admin_up', value => 'global_admin_up', template => '%s', + min => 0, max => 'total_port' } ] } }, { label => 'total-admin-down', filter => 'add_global', nlabel => 'total.interfaces.admin.down.count', set => { key_values => [ { name => 'global_admin_down' }, { name => 'total_port' } ], output_template => 'AdminStatus Down : %s', output_error_template => 'AdminStatus Down : %s', - output_use => 'global_admin_down_absolute', threshold_use => 'global_admin_down_absolute', + output_use => 'global_admin_down', threshold_use => 'global_admin_down', perfdatas => [ - { label => 'total_admin_down', value => 'global_admin_down_absolute', template => '%s', - min => 0, max => 'total_port_absolute' } + { label => 'total_admin_down', value => 'global_admin_down', template => '%s', + min => 0, max => 'total_port' } ] } }, { label => 'total-oper-up', filter => 'add_global', nlabel => 'total.interfaces.operational.up.count', set => { key_values => [ { name => 'global_oper_up' }, { name => 'total_port' } ], output_template => 'OperStatus Up : %s', output_error_template => 'OperStatus Up : %s', - output_use => 'global_oper_up_absolute', threshold_use => 'global_oper_up_absolute', + output_use => 'global_oper_up', threshold_use => 'global_oper_up', perfdatas => [ - { label => 'total_oper_up', value => 'global_oper_up_absolute', template => '%s', - min => 0, max => 'total_port_absolute' } + { label => 'total_oper_up', value => 'global_oper_up', template => '%s', + min => 0, max => 'total_port' } ] } }, { label => 'total-oper-down', filter => 'add_global', nlabel => 'total.interfaces.operational.down.count', set => { key_values => [ { name => 'global_oper_down' }, { name => 'total_port' } ], output_template => 'OperStatus Down : %s', output_error_template => 'OperStatus Down : %s', - output_use => 'global_oper_down_absolute', threshold_use => 'global_oper_down_absolute', + output_use => 'global_oper_down', threshold_use => 'global_oper_down', perfdatas => [ - { label => 'global_oper_down', value => 'global_oper_down_absolute', template => '%s', - min => 0, max => 'total_port_absolute' } + { label => 'global_oper_down', value => 'global_oper_down', template => '%s', + min => 0, max => 'total_port' } ] } } @@ -370,7 +370,6 @@ sub set_counters_traffic { push @{$self->{maps_counters}->{int}}, { label => 'in-traffic', filter => 'add_traffic', nlabel => 'interface.traffic.in.bitspersecond', set => { key_values => $self->set_key_values_in_traffic(), - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'in' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic In : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -379,7 +378,6 @@ sub set_counters_traffic { }, { label => 'out-traffic', filter => 'add_traffic', nlabel => 'interface.traffic.out.bitspersecond', set => { key_values => $self->set_key_values_out_traffic(), - per_second => 1, closure_custom_calc => $self->can('custom_traffic_calc'), closure_custom_calc_extra_options => { label_ref => 'out' }, closure_custom_output => $self->can('custom_traffic_output'), output_error_template => 'Traffic Out : %s', closure_custom_perfdata => $self->can('custom_traffic_perfdata'), @@ -537,8 +535,8 @@ sub set_counters_volume { output_template => 'Volume In : %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => 'volume_in', value => 'in_volume_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'volume_in', value => 'in_volume', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } }, @@ -547,8 +545,8 @@ sub set_counters_volume { output_template => 'Volume Out : %.2f %s', output_change_bytes => 1, perfdatas => [ - { label => 'volume_out', value => 'out_volume_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'volume_out', value => 'out_volume', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' } ] } } @@ -960,9 +958,9 @@ sub reload_cache { $self->{option_results}->{oid_extra_display} ne $self->{option_results}->{oid_filter}) { push @{$snmp_get}, { oid => $self->{oids_label}->{$self->{option_results}->{oid_extra_display}}->{oid} }; } - + my $result = $self->{snmp}->get_multiple_table(oids => $snmp_get); - + my $func = $self->can($self->{oids_label}->{$self->{option_results}->{oid_filter}}->{cache}); $func->($self, result => $result, datas => $datas, name => $self->{option_results}->{oid_filter}, store_index => 1); @@ -1055,7 +1053,7 @@ sub load_status { sub load_traffic { my ($self, %options) = @_; - + $self->set_oids_traffic(); $self->{snmp}->load(oids => [$self->{oid_in32}, $self->{oid_out32}], instances => $self->{array_interface_selected}); if ($self->{get_speed} == 1) { @@ -1071,7 +1069,7 @@ sub load_traffic { sub load_errors { my ($self, %options) = @_; - + $self->set_oids_errors(); $self->{snmp}->load( oids => [ diff --git a/snmp_standard/mode/isdnusage.pm b/snmp_standard/mode/isdnusage.pm index 2ae3a929a..30dd155f4 100644 --- a/snmp_standard/mode/isdnusage.pm +++ b/snmp_standard/mode/isdnusage.pm @@ -39,8 +39,8 @@ sub set_counters { key_values => [ { name => 'in', diff => 1 }, { name => 'display' } ], output_template => 'Incoming calls : %s', perfdatas => [ - { label => 'in_calls', value => 'in_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'in_calls', value => 'in', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -48,8 +48,8 @@ sub set_counters { key_values => [ { name => 'out', diff => 1 }, { name => 'display' } ], output_template => 'Outgoing calls : %s', perfdatas => [ - { label => 'out_calls', value => 'out_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'out_calls', value => 'out', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -59,8 +59,8 @@ sub set_counters { key_values => [ { name => 'active' }, { name => 'total' } ], output_template => 'Current calls : %s', perfdatas => [ - { label => 'current_calls', value => 'active_absolute', template => '%s', - min => 0, max => 'total_absolute' }, + { label => 'current_calls', value => 'active', template => '%s', + min => 0, max => 'total' }, ], } }, diff --git a/snmp_standard/mode/memory.pm b/snmp_standard/mode/memory.pm index 79289c4a9..5f23c43e3 100644 --- a/snmp_standard/mode/memory.pm +++ b/snmp_standard/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_usage_output { return sprintf( 'Ram Total: %s %s Used (-buffers/cache): %s %s (%.2f%%) Free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -43,11 +43,11 @@ sub custom_swap_output { return sprintf( 'Swap Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { label => 'used', value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { label => 'free', value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Ram Used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' } ] } @@ -92,7 +92,7 @@ sub set_counters { output_template => 'Buffer: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'buffer', value => 'memBuffer_absolute', template => '%d', + { label => 'buffer', value => 'memBuffer', template => '%d', min => 0, unit => 'B' } ] } @@ -102,7 +102,7 @@ sub set_counters { output_template => 'Cached: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'cached', value => 'memCached_absolute', template => '%d', + { label => 'cached', value => 'memCached', template => '%d', min => 0, unit => 'B' } ] } @@ -112,7 +112,7 @@ sub set_counters { output_template => 'Shared: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'shared', value => 'memShared_absolute', template => '%d', + { label => 'shared', value => 'memShared', template => '%d', min => 0, unit => 'B' } ] } @@ -123,7 +123,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_swap_output'), perfdatas => [ - { label => 'swap', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { label => 'swap', value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -132,7 +132,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_swap_output'), perfdatas => [ - { label => 'swap_free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { label => 'swap_free', value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -141,7 +141,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Swap Used : %.2f %%', perfdatas => [ - { label => 'swap_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { label => 'swap_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' } ] } diff --git a/snmp_standard/mode/mtausage.pm b/snmp_standard/mode/mtausage.pm index 158fc6d16..339e99d4c 100644 --- a/snmp_standard/mode/mtausage.pm +++ b/snmp_standard/mode/mtausage.pm @@ -39,8 +39,8 @@ sub set_counters { key_values => [ { name => 'mtaReceivedMessages', diff => 1 }, { name => 'display' } ], output_template => 'Total Received Messages : %s', output_error_template => "Total Received Messages : %s", perfdatas => [ - { label => 'total_received_messages', value => 'mtaReceivedMessages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_received_messages', value => 'mtaReceivedMessages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -49,8 +49,8 @@ sub set_counters { output_template => 'Total Received Volume : %s %s', output_error_template => "Total Received Volume : %s", output_change_bytes => 1, perfdatas => [ - { label => 'total_received_volume', value => 'mtaReceivedVolume_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_received_volume', value => 'mtaReceivedVolume', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -58,8 +58,8 @@ sub set_counters { key_values => [ { name => 'mtaStoredMessages' }, { name => 'display' } ], output_template => 'Total Stored Messages : %s', output_error_template => "Total Stored Messages : %s", perfdatas => [ - { label => 'total_stored_messages', value => 'mtaStoredMessages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_stored_messages', value => 'mtaStoredMessages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -68,8 +68,8 @@ sub set_counters { output_template => 'Total Stored Volume : %s %s', output_error_template => "Total Stored Volume : %s", output_change_bytes => 1, perfdatas => [ - { label => 'total_stored_volume', value => 'mtaStoredVolume_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_stored_volume', value => 'mtaStoredVolume', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -77,8 +77,8 @@ sub set_counters { key_values => [ { name => 'mtaTransmittedMessages', diff => 1 }, { name => 'display' } ], output_template => 'Total Transmitted Messages : %s', output_error_template => "Total Transmitted Messages : %s", perfdatas => [ - { label => 'total_transmitted_messages', value => 'mtaTransmittedMessages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_transmitted_messages', value => 'mtaTransmittedMessages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -87,8 +87,8 @@ sub set_counters { output_template => 'Total Transmitted Volume : %s %s', output_error_template => "Total Transmitted Volume : %s", output_change_bytes => 1, perfdatas => [ - { label => 'total_transmitted_volume', value => 'mtaTransmittedVolume_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_transmitted_volume', value => 'mtaTransmittedVolume', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -99,8 +99,8 @@ sub set_counters { key_values => [ { name => 'mtaGroupReceivedMessages', diff => 1 }, { name => 'display' } ], output_template => 'Received Messages : %s', output_error_template => "Received Messages : %s", perfdatas => [ - { label => 'received_messages', value => 'mtaGroupReceivedMessages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'received_messages', value => 'mtaGroupReceivedMessages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -109,8 +109,8 @@ sub set_counters { output_template => 'Received Volume : %s %s', output_error_template => "Received Volume : %s", output_change_bytes => 1, perfdatas => [ - { label => 'received_volume', value => 'mtaGroupReceivedVolume_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'received_volume', value => 'mtaGroupReceivedVolume', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -118,8 +118,8 @@ sub set_counters { key_values => [ { name => 'mtaGroupStoredMessages' }, { name => 'display' } ], output_template => 'Stored Messages : %s', output_error_template => "Stored Messages : %s", perfdatas => [ - { label => 'stored_messages', value => 'mtaGroupStoredMessages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'stored_messages', value => 'mtaGroupStoredMessages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -128,8 +128,8 @@ sub set_counters { output_template => 'Stored Volume : %s %s', output_error_template => "Stored Volume : %s", output_change_bytes => 1, perfdatas => [ - { label => 'stored_volume', value => 'mtaGroupStoredVolume_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'stored_volume', value => 'mtaGroupStoredVolume', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -137,8 +137,8 @@ sub set_counters { key_values => [ { name => 'mtaGroupTransmittedMessages', diff => 1 }, { name => 'display' } ], output_template => 'Transmitted Messages : %s', output_error_template => "Transmitted Messages : %s", perfdatas => [ - { label => 'transmitted_messages', value => 'mtaGroupTransmittedMessages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'transmitted_messages', value => 'mtaGroupTransmittedMessages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -147,8 +147,8 @@ sub set_counters { output_template => 'Transmitted Volume : %s %s', output_error_template => "Transmitted Volume : %s", output_change_bytes => 1, perfdatas => [ - { label => 'transmitted_volume', value => 'mtaGroupTransmittedVolume_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'transmitted_volume', value => 'mtaGroupTransmittedVolume', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -156,8 +156,8 @@ sub set_counters { key_values => [ { name => 'mtaGroupRejectedMessages', diff => 1 }, { name => 'display' } ], output_template => 'Rejected Messages : %s', output_error_template => "Rejected Messages : %s", perfdatas => [ - { label => 'rejected_messages', value => 'mtaGroupRejectedMessages_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'rejected_messages', value => 'mtaGroupRejectedMessages', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/snmp_standard/mode/ntp.pm b/snmp_standard/mode/ntp.pm index e30f1e7c7..c7e67fc51 100644 --- a/snmp_standard/mode/ntp.pm +++ b/snmp_standard/mode/ntp.pm @@ -32,8 +32,8 @@ sub custom_usage_output { return sprintf( 'Time offset %d second(s): %s', - $self->{result_values}->{offset_absolute}, - $self->{result_values}->{date_absolute} + $self->{result_values}->{offset}, + $self->{result_values}->{date} ); } @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'offset' }, { name => 'date' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'offset', value => 'offset_absolute', template => '%d', unit => 's' }, + { label => 'offset', value => 'offset', template => '%d', unit => 's' }, ], } }, diff --git a/snmp_standard/mode/storage.pm b/snmp_standard/mode/storage.pm index 9321f5c29..9f877ff1c 100644 --- a/snmp_standard/mode/storage.pm +++ b/snmp_standard/mode/storage.pm @@ -159,7 +159,7 @@ sub custom_access_output { my ($self, %options) = @_; my $msg = sprintf("Access : %s", - $self->{result_values}->{access_absolute} == 1 ? 'readWrite' : 'readOnly' + $self->{result_values}->{access} == 1 ? 'readWrite' : 'readOnly' ); return $msg; @@ -178,7 +178,7 @@ sub set_counters { key_values => [ { name => 'count' } ], output_template => 'Partitions count : %d', perfdatas => [ - { label => 'count', value => 'count_absolute', template => '%d', min => 0 } + { label => 'count', value => 'count', template => '%d', min => 0 } ] } }, @@ -197,8 +197,8 @@ sub set_counters { key_values => [ { name => 'access' }, { name => 'display' } ], closure_custom_output => $self->can('custom_access_output'), perfdatas => [ - { label => 'access', value => 'access_absolute', template => '%d', min => 1, max => 2, - label_extra_instance => 1, instance_use => 'display_absolute' } + { label => 'access', value => 'access', template => '%d', min => 1, max => 2, + label_extra_instance => 1, instance_use => 'display' } ] } } diff --git a/snmp_standard/mode/swap.pm b/snmp_standard/mode/swap.pm index a15a3862a..2e6d4df6e 100644 --- a/snmp_standard/mode/swap.pm +++ b/snmp_standard/mode/swap.pm @@ -29,11 +29,11 @@ sub custom_swap_output { my ($self, %options) = @_; my $msg = sprintf("Swap Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)", - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute}); + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free}); return $msg; } @@ -49,7 +49,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_swap_output'), perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { label => 'used', value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -58,7 +58,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_swap_output'), perfdatas => [ - { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { label => 'free', value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 }, ], } @@ -67,7 +67,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/storage/avid/isis/snmp/mode/performance.pm b/storage/avid/isis/snmp/mode/performance.pm index c2173aa60..84e942673 100644 --- a/storage/avid/isis/snmp/mode/performance.pm +++ b/storage/avid/isis/snmp/mode/performance.pm @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'OpenFiles' } ], output_template => 'Open files: %s files', perfdatas => [ - { label => 'open_files', value => 'OpenFiles_absolute', + { label => 'open_files', value => 'OpenFiles', template => '%s', min => 0, unit => 'files' }, ], } @@ -93,7 +93,7 @@ sub set_counters { key_values => [ { name => 'MessagesPerSecond' } ], output_template => 'Message processing speed: %s messages/s', perfdatas => [ - { label => 'processing_speed', value => 'MessagesPerSecond_absolute', + { label => 'processing_speed', value => 'MessagesPerSecond', template => '%s', min => 0, unit => 'messages/s' }, ], } @@ -103,7 +103,7 @@ sub set_counters { output_template => 'Read throughput: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'read_throughput', value => 'ReadMegabytesPerSecond_absolute', + { label => 'read_throughput', value => 'ReadMegabytesPerSecond', template => '%s', min => 0, unit => 'B/s' }, ], } @@ -113,7 +113,7 @@ sub set_counters { output_template => 'Write throughput: %s %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'write_throughput', value => 'WriteMegabytesPerSecond_absolute', + { label => 'write_throughput', value => 'WriteMegabytesPerSecond', template => '%s', min => 0, unit => 'B/s' }, ], } diff --git a/storage/avid/isis/snmp/mode/status.pm b/storage/avid/isis/snmp/mode/status.pm index 645311d40..0b5fdf5b8 100644 --- a/storage/avid/isis/snmp/mode/status.pm +++ b/storage/avid/isis/snmp/mode/status.pm @@ -60,7 +60,7 @@ sub set_counters { key_values => [ { name => 'WorkspaceRedistributingCount' } ], output_template => 'Workspace redistributing count: %d', perfdatas => [ - { label => 'redistributing_count', value => 'WorkspaceRedistributingCount_absolute', + { label => 'redistributing_count', value => 'WorkspaceRedistributingCount', template => '%d', min => 0 }, ], } diff --git a/storage/avid/isis/snmp/mode/usage.pm b/storage/avid/isis/snmp/mode/usage.pm index 9b4217ac5..70daa51ee 100644 --- a/storage/avid/isis/snmp/mode/usage.pm +++ b/storage/avid/isis/snmp/mode/usage.pm @@ -118,7 +118,7 @@ sub set_counters { key_values => [ { name => 'WorkspaceCount' } ], output_template => 'Workspace count: %d', perfdatas => [ - { label => 'workspace_count', value => 'WorkspaceCount_absolute', + { label => 'workspace_count', value => 'WorkspaceCount', template => '%d', min => 0 }, ], } @@ -127,7 +127,7 @@ sub set_counters { key_values => [ { name => 'FolderCount' } ], output_template => 'Folder count: %d', perfdatas => [ - { label => 'folder_count', value => 'FolderCount_absolute', + { label => 'folder_count', value => 'FolderCount', template => '%d', min => 0 }, ], } @@ -136,7 +136,7 @@ sub set_counters { key_values => [ { name => 'FileCount' } ], output_template => 'File count: %d', perfdatas => [ - { label => 'file_count', value => 'FileCount_absolute', + { label => 'file_count', value => 'FileCount', template => '%d', min => 0 }, ], } diff --git a/storage/dell/compellent/local/mode/hbausage.pm b/storage/dell/compellent/local/mode/hbausage.pm index de5a1190e..b7bb56d37 100644 --- a/storage/dell/compellent/local/mode/hbausage.pm +++ b/storage/dell/compellent/local/mode/hbausage.pm @@ -40,8 +40,8 @@ sub set_counters { key_values => [ { name => 'read_iops' }, { name => 'display' } ], output_template => 'Read IOPs : %s', perfdatas => [ - { label => 'read_iops', value => 'read_iops_absolute', template => '%d', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', value => 'read_iops', template => '%d', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -50,8 +50,8 @@ sub set_counters { output_template => 'Read usage : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'read_usage', value => 'read_bps_absolute', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_usage', value => 'read_bps', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -59,8 +59,8 @@ sub set_counters { key_values => [ { name => 'read_latency' }, { name => 'display' } ], output_template => 'Read latency : %s ms', perfdatas => [ - { label => 'read_latency', value => 'read_latency_absolute', template => '%d', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_latency', value => 'read_latency', template => '%d', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -68,8 +68,8 @@ sub set_counters { key_values => [ { name => 'write_iops' }, { name => 'display' } ], output_template => 'Write IOPs : %s', perfdatas => [ - { label => 'write_iops', value => 'write_iops_absolute', template => '%d', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', value => 'write_iops', template => '%d', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -78,8 +78,8 @@ sub set_counters { output_template => 'Write Usage : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'write_usage', value => 'write_bps_absolute', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_usage', value => 'write_bps', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -87,8 +87,8 @@ sub set_counters { key_values => [ { name => 'write_latency' }, { name => 'display' } ], output_template => 'Write Latency : %s ms', perfdatas => [ - { label => 'write_latency', value => 'write_latency_absolute', template => '%d', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_latency', value => 'write_latency', template => '%d', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/dell/compellent/local/mode/volumeusage.pm b/storage/dell/compellent/local/mode/volumeusage.pm index aa8dfe2cc..32c67d707 100644 --- a/storage/dell/compellent/local/mode/volumeusage.pm +++ b/storage/dell/compellent/local/mode/volumeusage.pm @@ -60,8 +60,8 @@ sub set_counters { output_template => 'Raid Overhead : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'volume_overhead', value => 'overhead_absolute', template => '%d', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'volume_overhead', value => 'overhead', template => '%d', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -70,8 +70,8 @@ sub set_counters { output_template => 'Replay : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'volume_replay', value => 'replay_absolute', template => '%d', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'volume_replay', value => 'replay', template => '%d', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/dell/equallogic/snmp/mode/arrayusage.pm b/storage/dell/equallogic/snmp/mode/arrayusage.pm index d28522b96..d976a074b 100644 --- a/storage/dell/equallogic/snmp/mode/arrayusage.pm +++ b/storage/dell/equallogic/snmp/mode/arrayusage.pm @@ -119,21 +119,21 @@ sub set_counters { }, { label => 'snapshot', set => { key_values => [ { name => 'eqlMemberSnapStorage' }, { name => 'display' } ], - output_change_bytes => 1, output_template => 'Snapshot usage : %s %s', + output_change_bytes => 1, perfdatas => [ - { label => 'snapshost', value => 'eqlMemberSnapStorage_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'snapshost', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'replication', set => { key_values => [ { name => 'eqlMemberReplStorage' }, { name => 'display' } ], - output_change_bytes => 1, output_template => 'Replication usage : %s %s', + output_change_bytes => 1, perfdatas => [ - { label => 'replication', value => 'eqlMemberReplStorage_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'replication', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -141,8 +141,8 @@ sub set_counters { key_values => [ { name => 'eqlMemberNumberOfConnections' }, { name => 'display' } ], output_template => 'iSCSI connections : %s', perfdatas => [ - { label => 'connections', value => 'eqlMemberNumberOfConnections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -150,8 +150,8 @@ sub set_counters { key_values => [ { name => 'eqlMemberNumberOfExtConnections' }, { name => 'display' } ], output_template => 'External iSCSI connections : %s', perfdatas => [ - { label => 'ext_connections', value => 'eqlMemberNumberOfExtConnections_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'ext_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -159,8 +159,8 @@ sub set_counters { key_values => [ { name => 'eqlMemberReadAvgLatency' }, { name => 'display' } ], output_template => 'Global read average latency : %s ms', perfdatas => [ - { label => 'global_read_avg_latency', value => 'eqlMemberReadAvgLatency_absolute', template => '%s', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'global_read_avg_latency', template => '%s', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -168,8 +168,8 @@ sub set_counters { key_values => [ { name => 'eqlMemberWriteAvgLatency' }, { name => 'display' } ], output_template => 'Global write average latency : %s ms', perfdatas => [ - { label => 'global_write_avg_latency', value => 'eqlMemberWriteAvgLatency_absolute', template => '%s', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'global_write_avg_latency', template => '%s', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -179,7 +179,7 @@ sub set_counters { closure_custom_calc => $self->can('custom_read_avg_latency_calc'), perfdatas => [ { label => 'read_avg_latency', value => 'read_avg_latency', template => '%.2f', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -189,47 +189,45 @@ sub set_counters { closure_custom_calc => $self->can('custom_write_avg_latency_calc'), perfdatas => [ { label => 'write_avg_latency', value => 'write_avg_latency', template => '%.2f', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-iops', set => { - key_values => [ { name => 'eqlMemberReadOpCount', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'eqlMemberReadOpCount', per_second => 1 }, { name => 'display' } ], output_template => 'Read IOPs : %.2f', perfdatas => [ - { label => 'read_iops', template => '%.2f', value => 'eqlMemberReadOpCount_per_second', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-iops', set => { - key_values => [ { name => 'eqlMemberWriteOpCount', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'eqlMemberWriteOpCount', per_second => 1 }, { name => 'display' } ], output_template => 'Write IOPs : %.2f', perfdatas => [ - { label => 'write_iops', template => '%.2f', value => 'eqlMemberWriteOpCount_per_second', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'traffic-in', display_ok => 0, set => { - key_values => [ { name => 'eqlMemberRxData', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + key_values => [ { name => 'eqlMemberRxData', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic In : %s %s/s', + output_change_bytes => 2, perfdatas => [ { label => 'traffic_in', value => 'eqlMemberRxData_per_second', template => '%s', - unit => 'b/s', min => 0, cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + unit => 'b/s', min => 0, cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, - { label => 'traffic-out', display_ok => 0, set => { - key_values => [ { name => 'eqlMemberTxData', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 2, + { label => 'traffic-out', display_ok => 0, set => { + key_values => [ { name => 'eqlMemberTxData', per_second => 1 }, { name => 'display' } ], output_template => 'Traffic Out : %s %s/s', + output_change_bytes => 2, perfdatas => [ - { label => 'traffic_out', value => 'eqlMemberTxData_per_second', template => '%s', - unit => 'b/s', min => 0, cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'traffic_out', template => '%s', + unit => 'b/s', min => 0, cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -248,7 +246,7 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, + 'filter-name:s' => { name => 'filter_name' } }); return $self; diff --git a/storage/dell/equallogic/snmp/mode/diskusage.pm b/storage/dell/equallogic/snmp/mode/diskusage.pm index 48370c29e..badc8b0f5 100644 --- a/storage/dell/equallogic/snmp/mode/diskusage.pm +++ b/storage/dell/equallogic/snmp/mode/diskusage.pm @@ -60,22 +60,22 @@ sub set_counters { } }, { label => 'read', set => { - key_values => [ { name => 'eqlDiskStatusBytesRead', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'eqlDiskStatusBytesRead', per_second => 1 }, { name => 'display' } ], output_template => 'read : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { label => 'read_iops', template => '%.2f', value => 'eqlDiskStatusBytesRead_per_second', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', template => '%.2f', + unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write', set => { - key_values => [ { name => 'eqlDiskStatusBytesWritten', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'eqlDiskStatusBytesWritten', per_second => 1 }, { name => 'display' } ], output_template => 'write : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { label => 'write', template => '%.2f', value => 'eqlDiskStatusBytesWritten_per_second', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write', template => '%.2f', + unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'eqlDiskStatusBusyTime', diff => 1 }, { name => 'display' } ], output_template => 'time busy : %s sec', perfdatas => [ - { label => 'busy_time', template => '%s', value => 'eqlDiskStatusBusyTime_absolute', - unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'busy_time', template => '%s', + unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -103,10 +103,10 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "unknown-status:s" => { name => 'unknown_status', default => '' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} !~ /on-line|spare|off-line/i' }, + 'filter-name:s' => { name => 'filter_name' }, + 'unknown-status:s' => { name => 'unknown_status', default => '' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /on-line|spare|off-line/i' } }); return $self; diff --git a/storage/dell/me4/restapi/mode/controllerstatistics.pm b/storage/dell/me4/restapi/mode/controllerstatistics.pm index 8b3bb3ade..c14a3459c 100644 --- a/storage/dell/me4/restapi/mode/controllerstatistics.pm +++ b/storage/dell/me4/restapi/mode/controllerstatistics.pm @@ -35,146 +35,112 @@ sub set_counters { $self->{maps_counters}->{controllers} = [ { label => 'data-read', nlabel => 'controller.data.read.bytespersecond', set => { - key_values => [ { name => 'data-read-numeric', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'data-read-numeric', per_second => 1 }, { name => 'display' } ], output_template => 'Data Read: %s%s/s', output_change_bytes => 1, - per_second => 1, perfdatas => [ - { label => 'data_read', value => 'data-read-numeric_per_second', - template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'data-written', nlabel => 'controller.data.written.bytespersecond', set => { - key_values => [ { name => 'data-written-numeric', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'data-written-numeric', per_second => 1 }, { name => 'display' } ], output_template => 'Data Written: %s%s/s', output_change_bytes => 1, - per_second => 1, perfdatas => [ - { label => 'data_written', value => 'data-written-numeric_per_second', - template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'reads', nlabel => 'controller.reads.count', set => { - key_values => [ { name => 'number-of-reads', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'number-of-reads', per_second => 1 }, { name => 'display' } ], output_template => 'Reads: %s/s', - per_second => 1, perfdatas => [ - { label => 'reads', value => 'number-of-reads_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'writes', nlabel => 'controller.writes.count', set => { - key_values => [ { name => 'number-of-writes', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'number-of-writes', per_second => 1 }, { name => 'display' } ], output_template => 'Writes: %s/s', - per_second => 1, perfdatas => [ - { label => 'writes', value => 'number-of-writes_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'data-transfer', nlabel => 'controller.data.transfer.bytespersecond', set => { - key_values => [ { name => 'bytes-per-second-numeric'}, { name => 'display'} ], + key_values => [ { name => 'bytes-per-second-numeric'}, { name => 'display' } ], output_template => 'Data Transfer: %s%s/s', output_change_bytes => 1, perfdatas => [ - { label => 'data_transfer', value => 'bytes-per-second-numeric_absolute', - template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'iops', nlabel => 'controller.iops.ops', set => { - key_values => [ { name => 'iops'}, { name => 'display'} ], + key_values => [ { name => 'iops'}, { name => 'display' } ], output_template => 'IOPS: %d ops', perfdatas => [ - { label => 'iops', value => 'iops_absolute', - template => '%d', min => 0, unit => 'ops', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%d', min => 0, unit => 'ops', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'forwarded-cmds', nlabel => 'controller.commands.forwarded.count', set => { - key_values => [ { name => 'num-forwarded-cmds'}, { name => 'display'} ], + key_values => [ { name => 'num-forwarded-cmds'}, { name => 'display' } ], output_template => 'Forwarded Commands: %d', perfdatas => [ - { label => 'forwarded_cmds', value => 'num-forwarded-cmds_absolute', - template => '%d', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-cache-used', nlabel => 'controller.cache.write.usage.percentage', set => { - key_values => [ { name => 'write-cache-used'}, { name => 'display'} ], + key_values => [ { name => 'write-cache-used'}, { name => 'display' } ], output_template => 'Cache Write Usage: %s%%', perfdatas => [ - { label => 'write_cache_used', value => 'write-cache-used_absolute', - template => '%d', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-cache-hits', nlabel => 'controller.cache.write.hits.count', set => { - key_values => [ { name => 'write-cache-hits', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'write-cache-hits', per_second => 1 }, { name => 'display' } ], output_template => 'Cache Write Hits: %s/s', - per_second => 1, perfdatas => [ - { label => 'write_cache_hits', value => 'write-cache-hits_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-cache-misses', nlabel => 'controller.cache.write.misses.count', set => { - key_values => [ { name => 'write-cache-misses', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'write-cache-misses', per_second => 1 }, { name => 'display' } ], output_template => 'Cache Write Misses: %s/s', - per_second => 1, perfdatas => [ - { label => 'write_cache_misses', value => 'write-cache-misses_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-cache-hits', nlabel => 'controller.cache.read.hits.count', set => { - key_values => [ { name => 'read-cache-hits', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'read-cache-hits', per_second => 1 }, { name => 'display' } ], output_template => 'Cache Read Hits: %s/s', - per_second => 1, perfdatas => [ - { label => 'read_cache_hits', value => 'read-cache-hits_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-cache-misses', nlabel => 'controller.cache.read.misses.count', set => { - key_values => [ { name => 'read-cache-misses', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'read-cache-misses', per_second => 1 }, { name => 'display' } ], output_template => 'Cache Read Misses: %s/s', - per_second => 1, perfdatas => [ - { label => 'read_cache_misses', value => 'read-cache-misses_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'cpu-utilization', nlabel => 'controller.cpu.utilization.percentage', set => { - key_values => [ { name => 'cpu-load'}, { name => 'display'} ], + key_values => [ { name => 'cpu-load'}, { name => 'display' } ], output_template => 'CPU Utilization: %.2f%%', perfdatas => [ - { label => 'cpu_utilization', value => 'cpu-load_absolute', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } - }, + } ]; } @@ -190,7 +156,7 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - 'filter-name:s' => { name => 'filter_name' }, + 'filter-name:s' => { name => 'filter_name' } }); return $self; diff --git a/storage/dell/me4/restapi/mode/interfaces.pm b/storage/dell/me4/restapi/mode/interfaces.pm index 0936724b2..710e50071 100644 --- a/storage/dell/me4/restapi/mode/interfaces.pm +++ b/storage/dell/me4/restapi/mode/interfaces.pm @@ -59,42 +59,36 @@ sub set_counters { } }, { label => 'read-iops', nlabel => 'port.io.read.usage.iops', set => { - key_values => [ { name => 'number_of_reads', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'number_of_reads', per_second => 1 }, { name => 'display' } ], output_template => 'read iops: %.2f', - per_second => 1, perfdatas => [ - { value => 'number_of_reads_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1 } + { template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1 } ] } }, { label => 'write-iops', nlabel => 'port.io.write.usage.iops', set => { - key_values => [ { name => 'number_of_writes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'number_of_writes', per_second => 1 }, { name => 'display' } ], output_template => 'write iops: %.2f', - per_second => 1, perfdatas => [ - { value => 'number_of_writes_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1 } + { template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1 } ] } }, { label => 'read-traffic', nlabel => 'port.traffic.read.usage.bitspersecond', set => { - key_values => [ { name => 'data_read_numeric', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'data_read_numeric', per_second => 1 }, { name => 'display' } ], output_template => 'read traffic: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'data_read_numeric_per_second', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1 } + { template => '%d', unit => 'b/s', min => 0, label_extra_instance => 1 } ] } }, { label => 'write-traffic', nlabel => 'port.traffic.write.usage.bitspersecond', set => { - key_values => [ { name => 'data_write_numeric' }, { name => 'display' } ], + key_values => [ { name => 'data_write_numeric', per_second => 1 }, { name => 'display' } ], output_template => 'write traffic: %s %s/s', - per_second => 1, output_change_bytes => 2, + output_change_bytes => 2, perfdatas => [ - { value => 'data_write_numeric_per_second', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1 } + { template => '%d', unit => 'b/s', min => 0, label_extra_instance => 1 } ] } } @@ -105,8 +99,7 @@ sub set_counters { key_values => [ { name => 'disparity_errors' }, { name => 'display' } ], output_template => 'disparity errors: %s', perfdatas => [ - { value => 'disparity_errors_absolute', template => '%d', - min => 0, label_extra_instance => 1 } + { template => '%d', min => 0, label_extra_instance => 1 } ] } }, @@ -114,17 +107,15 @@ sub set_counters { key_values => [ { name => 'lost_dwords' }, { name => 'display' } ], output_template => 'lost dwords: %s', perfdatas => [ - { value => 'lost_dwords_absolute', template => '%d', - min => 0, label_extra_instance => 1 } + { template => '%d', min => 0, label_extra_instance => 1 } ] } }, { label => 'interface-invalid-dwords', nlabel => 'port.interface.invalid.dwords.count', set => { - key_values => [ { name => 'lost_dwords' }, { name => 'display' } ], + key_values => [ { name => 'invalid_dwords' }, { name => 'display' } ], output_template => 'invalid dwords: %s', perfdatas => [ - { value => 'invalid_dwords_absolute', template => '%d', - min => 0, label_extra_instance => 1 } + { template => '%d', min => 0, label_extra_instance => 1 } ] } } diff --git a/storage/dell/me4/restapi/mode/volumestatistics.pm b/storage/dell/me4/restapi/mode/volumestatistics.pm index af015344e..fa64a9370 100644 --- a/storage/dell/me4/restapi/mode/volumestatistics.pm +++ b/storage/dell/me4/restapi/mode/volumestatistics.pm @@ -35,126 +35,96 @@ sub set_counters { $self->{maps_counters}->{volumes} = [ { label => 'data-read', nlabel => 'volume.data.read.bytespersecond', set => { - key_values => [ { name => 'data-read-numeric', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'data-read-numeric', per_second => 1 }, { name => 'display' } ], output_template => 'Data Read: %s%s/s', output_change_bytes => 1, - per_second => 1, perfdatas => [ - { label => 'data_read', value => 'data-read-numeric_per_second', - template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'data-written', nlabel => 'volume.data.written.bytespersecond', set => { - key_values => [ { name => 'data-written-numeric', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'data-written-numeric', per_second => 1 }, { name => 'display' } ], output_template => 'Data Written: %s%s/s', output_change_bytes => 1, - per_second => 1, perfdatas => [ - { label => 'data_written', value => 'data-written-numeric_per_second', - template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'reads', nlabel => 'volume.reads.count', set => { - key_values => [ { name => 'number-of-reads', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'number-of-reads', per_second => 1 }, { name => 'display' } ], output_template => 'Reads: %s/s', - per_second => 1, perfdatas => [ - { label => 'reads', value => 'number-of-reads_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'writes', nlabel => 'volume.writes.count', set => { - key_values => [ { name => 'number-of-writes', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'number-of-writes', per_second => 1 }, { name => 'display' } ], output_template => 'Writes: %s/s', - per_second => 1, perfdatas => [ - { label => 'writes', value => 'number-of-writes_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'data-transfer', nlabel => 'volume.data.transfer.bytespersecond', set => { - key_values => [ { name => 'bytes-per-second-numeric'}, { name => 'display'} ], + key_values => [ { name => 'bytes-per-second-numeric' }, { name => 'display' } ], output_template => 'Data Transfer: %s%s/s', output_change_bytes => 1, perfdatas => [ - { label => 'data_transfer', value => 'bytes-per-second-numeric_absolute', - template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'iops', nlabel => 'volume.iops.ops', set => { - key_values => [ { name => 'iops'}, { name => 'display'} ], + key_values => [ { name => 'iops' }, { name => 'display' } ], output_template => 'IOPS: %d ops', perfdatas => [ - { label => 'iops', value => 'iops_absolute', - template => '%d', min => 0, unit => 'ops', label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%d', min => 0, unit => 'ops', label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-cache-percent', nlabel => 'volume.cache.write.usage.percentage', set => { - key_values => [ { name => 'write-cache-percent'}, { name => 'display'} ], + key_values => [ { name => 'write-cache-percent'}, { name => 'display' } ], output_template => 'Cache Write Usage: %s%%', perfdatas => [ - { label => 'write_cache_used', value => 'write-cache-percent_absolute', - template => '%d', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%d', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-cache-hits', nlabel => 'volume.cache.write.hits.count', set => { - key_values => [ { name => 'write-cache-hits', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'write-cache-hits', per_second => 1 }, { name => 'display' } ], output_template => 'Cache Write Hits: %s/s', - per_second => 1, perfdatas => [ - { label => 'write_cache_hits', value => 'write-cache-hits_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-cache-misses', nlabel => 'volume.cache.write.misses.count', set => { - key_values => [ { name => 'write-cache-misses', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'write-cache-misses', per_second => 1 }, { name => 'display' } ], output_template => 'Cache Write Misses: %s/s', - per_second => 1, perfdatas => [ - { label => 'write_cache_misses', value => 'write-cache-misses_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-cache-hits', nlabel => 'volume.cache.read.hits.count', set => { - key_values => [ { name => 'read-cache-hits', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'read-cache-hits', per_second => 1 }, { name => 'display' } ], output_template => 'Cache Read Hits: %s/s', - per_second => 1, perfdatas => [ - { label => 'read_cache_hits', value => 'read-cache-hits_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-cache-misses', nlabel => 'volume.cache.read.misses.count', set => { - key_values => [ { name => 'read-cache-misses', diff => 1 }, { name => 'display'} ], + key_values => [ { name => 'read-cache-misses', per_second => 1 }, { name => 'display'} ], output_template => 'Cache Read Misses: %s/s', - per_second => 1, perfdatas => [ - { label => 'read_cache_misses', value => 'read-cache-misses_per_second', - template => '%s', min => 0, label_extra_instance => 1, - instance_use => 'display_absolute' }, - ], + { template => '%s', min => 0, label_extra_instance => 1, instance_use => 'display' }, + ] } - }, + } ]; } diff --git a/storage/emc/DataDomain/mode/replication.pm b/storage/emc/DataDomain/mode/replication.pm index cff1000c1..9a468cc68 100644 --- a/storage/emc/DataDomain/mode/replication.pm +++ b/storage/emc/DataDomain/mode/replication.pm @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'offset' }, { name => 'display' } ], output_template => 'last time peer sync : %s seconds ago', perfdatas => [ - { label => 'offset', value => 'offset_absolute', template => '%s', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'offset', value => 'offset', template => '%s', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/emc/isilon/snmp/mode/clusterusage.pm b/storage/emc/isilon/snmp/mode/clusterusage.pm index e66bf9180..9a5bd52b8 100644 --- a/storage/emc/isilon/snmp/mode/clusterusage.pm +++ b/storage/emc/isilon/snmp/mode/clusterusage.pm @@ -122,7 +122,7 @@ sub set_counters { key_values => [ { name => 'health' } ], output_template => 'Node health: %.2f%%', perfdatas => [ - { label => 'health', value => 'health_absolute', template => '%.2f', + { label => 'health', value => 'health', template => '%.2f', min => 0, max => 100, unit => '%' }, ], } diff --git a/storage/emc/unisphere/restapi/mode/pools.pm b/storage/emc/unisphere/restapi/mode/pools.pm index 48467c891..93b108391 100644 --- a/storage/emc/unisphere/restapi/mode/pools.pm +++ b/storage/emc/unisphere/restapi/mode/pools.pm @@ -37,13 +37,13 @@ sub custom_status_output { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space}); my $msg = sprintf('space usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space} ); return $msg; } @@ -51,15 +51,15 @@ sub custom_usage_output { sub custom_subscribed_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_sub_absolute}); - $self->{result_values}->{free_sub_absolute} = 0 if ($self->{result_values}->{free_sub_absolute} < 0); - $self->{result_values}->{prct_free_sub_absolute} = 0 if ($self->{result_values}->{prct_free_sub_absolute} < 0); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_sub_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_sub}); + $self->{result_values}->{free_sub} = 0 if ($self->{result_values}->{free_sub} < 0); + $self->{result_values}->{prct_free_sub} = 0 if ($self->{result_values}->{prct_free_sub} < 0); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_sub}); my $msg = sprintf('subscribed usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_sub_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_sub_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_sub}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_sub} ); return $msg; } @@ -84,8 +84,8 @@ sub set_counters { key_values => [ { name => 'used_space' }, { name => 'free_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -93,8 +93,8 @@ sub set_counters { key_values => [ { name => 'free_space' }, { name => 'used_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'free_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -102,8 +102,8 @@ sub set_counters { key_values => [ { name => 'prct_used_space' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { value => 'prct_used_space_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used_space', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -111,8 +111,8 @@ sub set_counters { key_values => [ { name => 'used_sub' }, { name => 'free_sub' }, { name => 'prct_used_sub' }, { name => 'prct_free_sub' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_subscribed_output'), perfdatas => [ - { value => 'used_sub_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used_sub', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -120,8 +120,8 @@ sub set_counters { key_values => [ { name => 'prct_used_sub' }, { name => 'display' } ], output_template => 'subcribed used : %.2f %%', perfdatas => [ - { value => 'prct_used_sub_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used_sub', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/emc/unisphere/restapi/mode/storageresources.pm b/storage/emc/unisphere/restapi/mode/storageresources.pm index 87fb88220..57815a469 100644 --- a/storage/emc/unisphere/restapi/mode/storageresources.pm +++ b/storage/emc/unisphere/restapi/mode/storageresources.pm @@ -37,13 +37,13 @@ sub custom_status_output { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space}); my $msg = sprintf('space usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space} ); return $msg; } @@ -51,15 +51,15 @@ sub custom_usage_output { sub custom_allocated_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_alloc_absolute}); - $self->{result_values}->{free_alloc_absolute} = 0 if ($self->{result_values}->{free_alloc_absolute} < 0); - $self->{result_values}->{prct_free_alloc_absolute} = 0 if ($self->{result_values}->{prct_free_alloc_absolute} < 0); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_alloc_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_alloc}); + $self->{result_values}->{free_alloc} = 0 if ($self->{result_values}->{free_alloc} < 0); + $self->{result_values}->{prct_free_alloc} = 0 if ($self->{result_values}->{prct_free_alloc} < 0); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_alloc}); my $msg = sprintf('allocated usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_alloc_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_alloc_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_alloc}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_alloc} ); return $msg; } @@ -84,8 +84,8 @@ sub set_counters { key_values => [ { name => 'used_space' }, { name => 'free_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -93,8 +93,8 @@ sub set_counters { key_values => [ { name => 'free_space' }, { name => 'used_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'free_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -102,8 +102,8 @@ sub set_counters { key_values => [ { name => 'prct_used_space' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { value => 'prct_used_space_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used_space', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -111,8 +111,8 @@ sub set_counters { key_values => [ { name => 'used_alloc' }, { name => 'free_alloc' }, { name => 'prct_used_alloc' }, { name => 'prct_free_alloc' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_allocated_output'), perfdatas => [ - { value => 'used_alloc_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used_alloc', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -120,8 +120,8 @@ sub set_counters { key_values => [ { name => 'prct_used_alloc' }, { name => 'display' } ], output_template => 'allocated used : %.2f %%', perfdatas => [ - { value => 'prct_used_alloc_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used_alloc', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/emc/xtremio/restapi/mode/ssdiops.pm b/storage/emc/xtremio/restapi/mode/ssdiops.pm index 816456b2c..a5c51d189 100644 --- a/storage/emc/xtremio/restapi/mode/ssdiops.pm +++ b/storage/emc/xtremio/restapi/mode/ssdiops.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'total' } ], output_template => 'Total : %s iops', perfdatas => [ - { label => 'total', value => 'total_absolute', template => '%s', + { label => 'total', value => 'total', template => '%s', min => 0, unit => 'iops' }, ], } @@ -47,7 +47,7 @@ sub set_counters { key_values => [ { name => 'total_read' } ], output_template => 'Total read : %s iops', perfdatas => [ - { label => 'total_read', value => 'total_read_absolute', template => '%s', + { label => 'total_read', value => 'total_read', template => '%s', min => 0, unit => 'iops' }, ], } @@ -56,7 +56,7 @@ sub set_counters { key_values => [ { name => 'total_write' } ], output_template => 'Total write : %s iops', perfdatas => [ - { label => 'total_write', value => 'total_write_absolute', template => '%s', + { label => 'total_write', value => 'total_write', template => '%s', min => 0, unit => 'iops' }, ], } @@ -68,8 +68,8 @@ sub set_counters { key_values => [ { name => 'global_iops' }, { name => 'display' }, ], output_template => 'Global : %s iops', perfdatas => [ - { label => 'global', value => 'global_iops_absolute', template => '%s', - min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'global', value => 'global_iops', template => '%s', + min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -77,8 +77,8 @@ sub set_counters { key_values => [ { name => 'read_iops' }, { name => 'display' }, ], output_template => 'Read : %s iops', perfdatas => [ - { label => 'read', value => 'read_iops_absolute', template => '%s', - min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read', value => 'read_iops', template => '%s', + min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -86,8 +86,8 @@ sub set_counters { key_values => [ { name => 'write_iops' }, { name => 'display' }, ], output_template => 'Write : %s iopss', perfdatas => [ - { label => 'write', value => 'write_iops_absolute', template => '%s', - min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write', value => 'write_iops', template => '%s', + min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/fujitsu/eternus/dx/ssh/mode/cpu.pm b/storage/fujitsu/eternus/dx/ssh/mode/cpu.pm index 5ae8aca14..a15f638b9 100644 --- a/storage/fujitsu/eternus/dx/ssh/mode/cpu.pm +++ b/storage/fujitsu/eternus/dx/ssh/mode/cpu.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'usage' }, { name => 'display' } ], output_template => 'Usage : %d %%', perfdatas => [ - { label => 'cpu', value => 'usage_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'cpu', value => 'usage', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/fujitsu/eternus/dx/ssh/mode/portstats.pm b/storage/fujitsu/eternus/dx/ssh/mode/portstats.pm index cdb6fe8e0..1a6bd8036 100644 --- a/storage/fujitsu/eternus/dx/ssh/mode/portstats.pm +++ b/storage/fujitsu/eternus/dx/ssh/mode/portstats.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'read_iops' }, { name => 'display' } ], output_template => 'Read IOPS : %d', perfdatas => [ - { label => 'read_iops', value => 'read_iops_absolute', template => '%d', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', value => 'read_iops', template => '%d', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'write_iops' }, { name => 'display' } ], output_template => 'Write IOPS : %d', perfdatas => [ - { label => 'write_iops', value => 'write_iops_absolute', template => '%d', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', value => 'write_iops', template => '%d', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'read_traffic' }, { name => 'display' } ], output_template => 'Read Traffic : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'read_traffic', value => 'read_traffic_absolute', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_traffic', value => 'read_traffic', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'write_traffic' }, { name => 'display' } ], output_template => 'Write Traffic : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'write_traffic', value => 'write_traffic_absolute', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_traffic', value => 'write_traffic', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/fujitsu/eternus/dx/ssh/mode/volumestats.pm b/storage/fujitsu/eternus/dx/ssh/mode/volumestats.pm index 5251608cd..55a096ee0 100644 --- a/storage/fujitsu/eternus/dx/ssh/mode/volumestats.pm +++ b/storage/fujitsu/eternus/dx/ssh/mode/volumestats.pm @@ -38,8 +38,8 @@ sub set_counters { key_values => [ { name => 'read_iops' }, { name => 'display' } ], output_template => 'Read IOPS : %d', perfdatas => [ - { label => 'read_iops', value => 'read_iops_absolute', template => '%d', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', value => 'read_iops', template => '%d', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { key_values => [ { name => 'write_iops' }, { name => 'display' } ], output_template => 'Write IOPS : %d', perfdatas => [ - { label => 'write_iops', value => 'write_iops_absolute', template => '%d', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', value => 'write_iops', template => '%d', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'read_throughput' }, { name => 'display' } ], output_template => 'Read Traffic : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'read_throughput', value => 'read_throughput_absolute', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_throughput', value => 'read_throughput', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'write_throughput' }, { name => 'display' } ], output_template => 'Write Traffic : %s %s/s', output_change_bytes => 2, perfdatas => [ - { label => 'write_throughput', value => 'write_throughput_absolute', template => '%d', - unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_throughput', value => 'write_throughput', template => '%d', + unit => 'b/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'read_response_time' }, { name => 'display' } ], output_template => 'Read Response Time : %d ms', perfdatas => [ - { label => 'read_response_time', value => 'read_response_time_absolute', template => '%d', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_response_time', value => 'read_response_time', template => '%d', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'write_response_time' }, { name => 'display' } ], output_template => 'Write Response Time : %d ms', perfdatas => [ - { label => 'write_response_time', value => 'write_response_time_absolute', template => '%d', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_response_time', value => 'write_response_time', template => '%d', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -92,8 +92,8 @@ sub set_counters { key_values => [ { name => 'read_processing_time' }, { name => 'display' } ], output_template => 'Read Processing Time : %d ms', perfdatas => [ - { label => 'read_processing_time', value => 'read_processing_time_absolute', template => '%d', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_processing_time', value => 'read_processing_time', template => '%d', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -101,8 +101,8 @@ sub set_counters { key_values => [ { name => 'write_processing_time' }, { name => 'display' } ], output_template => 'Write Processing Time : %d ms', perfdatas => [ - { label => 'write_processing_time', value => 'write_processing_time_absolute', template => '%d', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_processing_time', value => 'write_processing_time', template => '%d', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -110,8 +110,8 @@ sub set_counters { key_values => [ { name => 'read_cache_hit_rate' }, { name => 'display' } ], output_template => 'Read Cache Hit Rate : %d %%', perfdatas => [ - { label => 'read_cache_hit_rate', value => 'read_cache_hit_rate_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_cache_hit_rate', value => 'read_cache_hit_rate', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -119,8 +119,8 @@ sub set_counters { key_values => [ { name => 'write_cache_hit_rate' }, { name => 'display' } ], output_template => 'Write Cache Hit Rate : %d %%', perfdatas => [ - { label => 'write_cache_hit_rate', value => 'write_cache_hit_rate_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_cache_hit_rate', value => 'write_cache_hit_rate', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/hp/3par/ssh/mode/diskusage.pm b/storage/hp/3par/ssh/mode/diskusage.pm index aa0063094..e61737403 100644 --- a/storage/hp/3par/ssh/mode/diskusage.pm +++ b/storage/hp/3par/ssh/mode/diskusage.pm @@ -36,13 +36,13 @@ sub custom_status_output { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); my $msg = sprintf("Usage Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_absolute}); + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free}); return $msg; } @@ -66,8 +66,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'free', value => 'free', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -84,8 +84,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/hp/3par/ssh/mode/volumeusage.pm b/storage/hp/3par/ssh/mode/volumeusage.pm index e2a5b502a..4f900d840 100644 --- a/storage/hp/3par/ssh/mode/volumeusage.pm +++ b/storage/hp/3par/ssh/mode/volumeusage.pm @@ -28,13 +28,13 @@ use warnings; sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); my $msg = sprintf("Usage Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_absolute}); + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free}); return $msg; } @@ -50,8 +50,8 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -59,8 +59,8 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'free', value => 'free', template => '%d', min => 0, max => 'total', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -68,8 +68,8 @@ sub set_counters { key_values => [ { name => 'prct_used' }, { name => 'display' } ], output_template => 'Used : %.2f %%', perfdatas => [ - { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used_prct', value => 'prct_used', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/hp/lefthand/snmp/mode/volumeusage.pm b/storage/hp/lefthand/snmp/mode/volumeusage.pm index 7c3a84525..494d1ca6b 100644 --- a/storage/hp/lefthand/snmp/mode/volumeusage.pm +++ b/storage/hp/lefthand/snmp/mode/volumeusage.pm @@ -125,42 +125,40 @@ sub set_counters { } }, { label => 'read', set => { - key_values => [ { name => 'clusVolumeStatsKbytesRead', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'clusVolumeStatsKbytesRead', per_second => 1 }, { name => 'display' } ], output_template => 'Read I/O : %s %s/s', output_error_template => "Read I/O : %s", - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'read', value => 'clusVolumeStatsKbytesRead_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read', template => '%d', + unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write', set => { - key_values => [ { name => 'clusVolumeStatsKbytesWrite', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'clusVolumeStatsKbytesWrite', per_second => 1 }, { name => 'display' } ], output_template => 'Write I/O : %s %s/s', output_error_template => "Write I/O : %s", - output_change_bytes => 1, per_second => 1, + output_change_bytes => 1, perfdatas => [ - { label => 'write', value => 'clusVolumeStatsKbytesWrite_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write', template => '%d', + unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'read-iops', set => { - key_values => [ { name => 'clusVolumeStatsIOsRead', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'clusVolumeStatsIOsRead', per_second => 1 }, { name => 'display' } ], output_template => 'Read IOPs : %.2f', output_error_template => "Read IOPs : %s", perfdatas => [ - { label => 'read_iops', value => 'clusVolumeStatsIOsRead_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'write-iops', set => { - key_values => [ { name => 'clusVolumeStatsIOsWrite', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'clusVolumeStatsIOsWrite', per_second => 1 }, { name => 'display' } ], output_template => 'Write IOPs : %.2f', output_error_template => "Write IOPs : %s", perfdatas => [ - { label => 'write_iops', value => 'clusVolumeStatsIOsWrite_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_iops', template => '%.2f', + unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -168,8 +166,8 @@ sub set_counters { key_values => [ { name => 'clusVolumeStatsIoLatencyRead', diff => 1 }, { name => 'display' } ], output_template => 'Read Latency : %.2f ms', output_error_template => "Read Latency : %s", perfdatas => [ - { label => 'read_latency', value => 'clusVolumeStatsIoLatencyRead_absolute', template => '%.2f', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'read_latency', template => '%.2f', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -177,8 +175,8 @@ sub set_counters { key_values => [ { name => 'clusVolumeStatsIoLatencyWrite', diff => 1 }, { name => 'display' } ], output_template => 'Write Latency : %.2f ms', output_error_template => "Write Latency : %s", perfdatas => [ - { label => 'write_latency', value => 'clusVolumeStatsIoLatencyWrite_absolute', template => '%.2f', - unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'write_latency', template => '%.2f', + unit => 'ms', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -187,9 +185,9 @@ sub set_counters { closure_custom_calc => $self->can('custom_status_calc'), closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold } - }, + } ]; } @@ -199,11 +197,11 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - "filter-name:s" => { name => 'filter_name' }, - "warning-replication-status:s" => { name => 'warning_replication_status', default => '' }, - "critical-replication-status:s" => { name => 'critical_replication_status', default => '%{status} !~ /normal/i' }, - "units:s" => { name => 'units', default => '%' }, - "free" => { name => 'free' }, + 'filter-name:s' => { name => 'filter_name' }, + 'warning-replication-status:s' => { name => 'warning_replication_status', default => '' }, + 'critical-replication-status:s' => { name => 'critical_replication_status', default => '%{status} !~ /normal/i' }, + 'units:s' => { name => 'units', default => '%' }, + 'free' => { name => 'free' } }); return $self; diff --git a/storage/hp/p2000/xmlapi/mode/vdisks.pm b/storage/hp/p2000/xmlapi/mode/vdisks.pm index da4cf1183..f36098eb2 100644 --- a/storage/hp/p2000/xmlapi/mode/vdisks.pm +++ b/storage/hp/p2000/xmlapi/mode/vdisks.pm @@ -36,13 +36,13 @@ sub custom_status_output { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space}); my $msg = sprintf('space usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space} ); return $msg; } @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'used_space' }, { name => 'free_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -76,8 +76,8 @@ sub set_counters { key_values => [ { name => 'free_space' }, { name => 'used_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'free_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -85,8 +85,8 @@ sub set_counters { key_values => [ { name => 'prct_used_space' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { value => 'prct_used_space_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used_space', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/hp/p2000/xmlapi/mode/volumesstats.pm b/storage/hp/p2000/xmlapi/mode/volumesstats.pm index df1cb53b1..a415698be 100644 --- a/storage/hp/p2000/xmlapi/mode/volumesstats.pm +++ b/storage/hp/p2000/xmlapi/mode/volumesstats.pm @@ -65,24 +65,20 @@ sub set_counters { $self->{maps_counters}->{volume} = [ { label => 'read', nlabel => 'volume.io.read.usage.bytespersecond', set => { - key_values => [ { name => 'data-read-numeric', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'data-read-numeric', per_second => 1 } ], output_template => 'Read I/O : %s %s/s', output_change_bytes => 1, perfdatas => [ - { value => 'data-read-numeric_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1 }, + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } }, { label => 'write', nlabel => 'volume.io.write.usage.bytespersecond', set => { - key_values => [ { name => 'data-written-numeric', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'data-written-numeric', per_second => 1 } ], output_template => 'Write I/O : %s %s/s', output_change_bytes => 1, perfdatas => [ - { value => 'data-written-numeric_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1 }, + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1 }, ], } }, @@ -112,11 +108,10 @@ sub set_counters { key_values => [ { name => 'iops' } ], output_template => 'IOPs : %s', perfdatas => [ - { value => 'iops_absolute', - unit => 'iops', min => 0, label_extra_instance => 1 }, - ], + { unit => 'iops', min => 0, label_extra_instance => 1 } + ] } - }, + } ]; } @@ -126,8 +121,8 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - 'name:s' => { name => 'name' }, - 'regexp' => { name => 'use_regexp' }, + 'name:s' => { name => 'name' }, + 'regexp' => { name => 'use_regexp' }, }); return $self; diff --git a/storage/hp/storeonce/restapi/mode/clusterusage.pm b/storage/hp/storeonce/restapi/mode/clusterusage.pm index 503d49ab4..1e430b549 100644 --- a/storage/hp/storeonce/restapi/mode/clusterusage.pm +++ b/storage/hp/storeonce/restapi/mode/clusterusage.pm @@ -135,8 +135,8 @@ sub set_counters { key_values => [ { name => 'dedup' }, { name => 'display' } ], output_template => 'Dedup Ratio : %.2f', perfdatas => [ - { label => 'dedup_ratio', value => 'dedup_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'dedup_ratio', value => 'dedup', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/hp/storeonce/restapi/mode/fcsusage.pm b/storage/hp/storeonce/restapi/mode/fcsusage.pm index 33a1d6fe6..95a44d7ec 100644 --- a/storage/hp/storeonce/restapi/mode/fcsusage.pm +++ b/storage/hp/storeonce/restapi/mode/fcsusage.pm @@ -63,8 +63,8 @@ sub set_counters { output_template => 'Used : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'used', value => 'used_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'used', value => 'used', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -72,8 +72,8 @@ sub set_counters { key_values => [ { name => 'dedup' }, { name => 'display' } ], output_template => 'Dedup Ratio : %.2f', perfdatas => [ - { label => 'dedup_ratio', value => 'dedup_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'dedup_ratio', value => 'dedup', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -81,8 +81,8 @@ sub set_counters { key_values => [ { name => 'num_items' }, { name => 'display' } ], output_template => 'Num Items : %s', perfdatas => [ - { label => 'items', value => 'num_items_absolute', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'items', value => 'num_items', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/hp/storeonce/restapi/mode/servicesetusage.pm b/storage/hp/storeonce/restapi/mode/servicesetusage.pm index 93c5e5519..bafc14c03 100644 --- a/storage/hp/storeonce/restapi/mode/servicesetusage.pm +++ b/storage/hp/storeonce/restapi/mode/servicesetusage.pm @@ -138,8 +138,8 @@ sub set_counters { key_values => [ { name => 'dedup' }, { name => 'display' } ], output_template => 'Dedup Ratio : %.2f', perfdatas => [ - { label => 'dedup_ratio', value => 'dedup_absolute', template => '%.2f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'dedup_ratio', value => 'dedup', template => '%.2f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/ibm/fs900/snmp/mode/arraysstatus.pm b/storage/ibm/fs900/snmp/mode/arraysstatus.pm index a357b014f..2b3c5a142 100644 --- a/storage/ibm/fs900/snmp/mode/arraysstatus.pm +++ b/storage/ibm/fs900/snmp/mode/arraysstatus.pm @@ -60,8 +60,8 @@ sub set_counters { key_values => [ { name => 'arrayVDiskCount' }, { name => 'arrayId' } ], output_template => 'VDisk count: %s', perfdatas => [ - { label => 'vdisk_count', value => 'arrayVDiskCount_absolute', template => '%s', label_extra_instance => 1, - instance_use => 'arrayId_absolute', min => 0 }, + { label => 'vdisk_count', value => 'arrayVDiskCount', template => '%s', label_extra_instance => 1, + instance_use => 'arrayId', min => 0 }, ], } }, diff --git a/storage/ibm/fs900/snmp/mode/fcusage.pm b/storage/ibm/fs900/snmp/mode/fcusage.pm index a0c7f6b7f..8b6c282b8 100644 --- a/storage/ibm/fs900/snmp/mode/fcusage.pm +++ b/storage/ibm/fs900/snmp/mode/fcusage.pm @@ -96,8 +96,8 @@ sub set_counters { key_values => [ { name => 'fcReadIOPS' }, { name => 'fcObject' } ], output_template => 'Read IOPS: %s iops', perfdatas => [ - { label => 'read_iops', value => 'fcReadIOPS_absolute', template => '%s', label_extra_instance => 1, - instance_use => 'fcObject_absolute', min => 0, unit => 'iops' }, + { label => 'read_iops', value => 'fcReadIOPS', template => '%s', label_extra_instance => 1, + instance_use => 'fcObject', min => 0, unit => 'iops' }, ], } }, @@ -105,8 +105,8 @@ sub set_counters { key_values => [ { name => 'fcWriteIOPS' }, { name => 'fcObject' } ], output_template => 'Write IOPS: %s iops', perfdatas => [ - { label => 'write_iops', value => 'fcWriteIOPS_absolute', template => '%s', label_extra_instance => 1, - instance_use => 'fcObject_absolute', min => 0, unit => 'iops' }, + { label => 'write_iops', value => 'fcWriteIOPS', template => '%s', label_extra_instance => 1, + instance_use => 'fcObject', min => 0, unit => 'iops' }, ], } }, @@ -114,8 +114,8 @@ sub set_counters { key_values => [ { name => 'fcReadQueueDepth' }, { name => 'fcObject' } ], output_template => 'Read queue depth: %s', perfdatas => [ - { label => 'read_queue_depth', value => 'fcReadQueueDepth_absolute', template => '%s', label_extra_instance => 1, - instance_use => 'fcObject_absolute', min => 0, unit => 'iops' }, + { label => 'read_queue_depth', value => 'fcReadQueueDepth', template => '%s', label_extra_instance => 1, + instance_use => 'fcObject', min => 0, unit => 'iops' }, ], } }, @@ -123,8 +123,8 @@ sub set_counters { key_values => [ { name => 'fcWriteQueueDepth' }, { name => 'fcObject' } ], output_template => 'Write queue depth: %s', perfdatas => [ - { label => 'write_queue_depth', value => 'fcWriteQueueDepth_absolute', template => '%s', label_extra_instance => 1, - instance_use => 'fcObject_absolute', min => 0, unit => 'iops' }, + { label => 'write_queue_depth', value => 'fcWriteQueueDepth', template => '%s', label_extra_instance => 1, + instance_use => 'fcObject', min => 0, unit => 'iops' }, ], } }, diff --git a/storage/kaminario/restapi/mode/systemusage.pm b/storage/kaminario/restapi/mode/systemusage.pm index 569a5d935..b0a903ed2 100644 --- a/storage/kaminario/restapi/mode/systemusage.pm +++ b/storage/kaminario/restapi/mode/systemusage.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'iops_avg' } ], output_template => 'Average IOPs : %s', perfdatas => [ - { label => 'iops', value => 'iops_avg_absolute', template => '%s', + { label => 'iops', value => 'iops_avg', template => '%s', min => 0, unit => 'iops' }, ], } @@ -48,7 +48,7 @@ sub set_counters { output_template => 'Average Throughput : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'throughput', value => 'throughput_avg_absolute', template => '%s', + { label => 'throughput', value => 'throughput_avg', template => '%s', min => 0, unit => 'B' }, ], } @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'latency_inner' } ], output_template => 'Latency Inner : %.6fms', perfdatas => [ - { label => 'latency_inner', value => 'latency_inner_absolute', template => '%.6f', + { label => 'latency_inner', value => 'latency_inner', template => '%.6f', min => 0, unit => 'ms' }, ], } @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'latency_outer' } ], output_template => 'Latency Outer : %.6fms', perfdatas => [ - { label => 'latency_outer', value => 'latency_outer_absolute', template => '%.6f', + { label => 'latency_outer', value => 'latency_outer', template => '%.6f', min => 0, unit => 'ms' }, ], } @@ -78,8 +78,8 @@ sub set_counters { key_values => [ { name => 'iops_avg' }, { name => 'display' } ], output_template => 'Average IOPs : %s', perfdatas => [ - { label => 'iops', value => 'iops_avg_absolute', template => '%s', - min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'iops', value => 'iops_avg', template => '%s', + min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -88,8 +88,8 @@ sub set_counters { output_template => 'Average Throughput : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'throughput', value => 'throughput_avg_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'throughput', value => 'throughput_avg', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -97,8 +97,8 @@ sub set_counters { key_values => [ { name => 'latency_inner' }, { name => 'display' } ], output_template => 'Latency Inner : %.6fms', perfdatas => [ - { label => 'latency_inner', value => 'latency_inner_absolute', template => '%.6f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'latency_inner', value => 'latency_inner', template => '%.6f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -106,8 +106,8 @@ sub set_counters { key_values => [ { name => 'latency_outer' }, { name => 'display' } ], output_template => 'Latency Outer : %.6fms', perfdatas => [ - { label => 'latency_outer', value => 'latency_outer_absolute', template => '%.6f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'latency_outer', value => 'latency_outer', template => '%.6f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/kaminario/restapi/mode/volumeusage.pm b/storage/kaminario/restapi/mode/volumeusage.pm index b9f6a26a6..1696e596a 100644 --- a/storage/kaminario/restapi/mode/volumeusage.pm +++ b/storage/kaminario/restapi/mode/volumeusage.pm @@ -37,8 +37,8 @@ sub set_counters { key_values => [ { name => 'iops_avg' }, { name => 'display' } ], output_template => 'Average IOPs : %s', perfdatas => [ - { label => 'iops', value => 'iops_avg_absolute', template => '%s', - min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'iops', value => 'iops_avg', template => '%s', + min => 0, unit => 'iops', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -47,8 +47,8 @@ sub set_counters { output_template => 'Average Throughput : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'throughput', value => 'throughput_avg_absolute', template => '%s', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'throughput', value => 'throughput_avg', template => '%s', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -56,8 +56,8 @@ sub set_counters { key_values => [ { name => 'latency_inner' }, { name => 'display' } ], output_template => 'Latency Inner : %.6fms', perfdatas => [ - { label => 'latency_inner', value => 'latency_inner_absolute', template => '%.6f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'latency_inner', value => 'latency_inner', template => '%.6f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -65,8 +65,8 @@ sub set_counters { key_values => [ { name => 'latency_outer' }, { name => 'display' } ], output_template => 'Latency Outer : %.6fms', perfdatas => [ - { label => 'latency_outer', value => 'latency_outer_absolute', template => '%.6f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'latency_outer', value => 'latency_outer', template => '%.6f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/lenovo/iomega/snmp/mode/memory.pm b/storage/lenovo/iomega/snmp/mode/memory.pm index 41a997002..157d36343 100644 --- a/storage/lenovo/iomega/snmp/mode/memory.pm +++ b/storage/lenovo/iomega/snmp/mode/memory.pm @@ -30,11 +30,11 @@ sub custom_usage_output { return sprintf( 'Ram Total: %s %s Used (-buffers/cache): %s %s (%.2f%%) Free: %s %s (%.2f%%)', - $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), - $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), - $self->{result_values}->{prct_used_absolute}, - $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), - $self->{result_values}->{prct_free_absolute} + $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), + $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), + $self->{result_values}->{prct_used}, + $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}), + $self->{result_values}->{prct_free} ); } @@ -50,7 +50,7 @@ sub set_counters { key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'used', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -59,7 +59,7 @@ sub set_counters { key_values => [ { name => 'free' }, { name => 'used' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', + { value => 'free', template => '%d', min => 0, max => 'total', unit => 'B', cast_int => 1 } ] } @@ -68,7 +68,7 @@ sub set_counters { key_values => [ { name => 'prct_used' } ], output_template => 'Ram Used : %.2f %%', perfdatas => [ - { value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_used', template => '%.2f', min => 0, max => 100, unit => '%' } ] } @@ -78,7 +78,7 @@ sub set_counters { output_template => 'Buffer: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'buffer_absolute', template => '%d', + { value => 'buffer', template => '%d', min => 0, unit => 'B' } ] } @@ -88,7 +88,7 @@ sub set_counters { output_template => 'Cached: %s %s', output_change_bytes => 1, perfdatas => [ - { value => 'cached_absolute', template => '%d', + { value => 'cached', template => '%d', min => 0, unit => 'B' } ] } diff --git a/storage/netapp/ontap/oncommandapi/mode/clusterio.pm b/storage/netapp/ontap/oncommandapi/mode/clusterio.pm index 93b09c122..1a11219f9 100644 --- a/storage/netapp/ontap/oncommandapi/mode/clusterio.pm +++ b/storage/netapp/ontap/oncommandapi/mode/clusterio.pm @@ -44,8 +44,8 @@ sub set_counters { output_template => 'Total throughput: %.2f %s/s', output_change_bytes => 1, perfdatas => [ - { label => 'total_throughput', value => 'total_throughput_absolute', template => '%.2f', - min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'total_throughput', value => 'total_throughput', template => '%.2f', + min => 0, unit => 'B/s', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -53,8 +53,8 @@ sub set_counters { key_values => [ { name => 'total_ops' }, { name => 'name' } ], output_template => 'Total IOPS: %.2f ops/s', perfdatas => [ - { label => 'total_ops', value => 'total_ops_absolute', template => '%.2f', - min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'total_ops', value => 'total_ops', template => '%.2f', + min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/storage/netapp/ontap/oncommandapi/mode/clusterusage.pm b/storage/netapp/ontap/oncommandapi/mode/clusterusage.pm index a90f45f24..930b94f54 100644 --- a/storage/netapp/ontap/oncommandapi/mode/clusterusage.pm +++ b/storage/netapp/ontap/oncommandapi/mode/clusterusage.pm @@ -43,8 +43,8 @@ sub set_counters { key_values => [ { name => 'max_node_utilization' }, { name => 'name' } ], output_template => 'Node utilization: %.2f %%', perfdatas => [ - { label => 'max_node_utilization', value => 'max_node_utilization_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'max_node_utilization', value => 'max_node_utilization', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -52,8 +52,8 @@ sub set_counters { key_values => [ { name => 'max_aggregate_utilization' }, { name => 'name' } ], output_template => 'Aggregate utilization: %.2f %%', perfdatas => [ - { label => 'max_aggregate_utilization', value => 'max_aggregate_utilization_absolute', template => '%.2f', - min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'max_aggregate_utilization', value => 'max_aggregate_utilization', template => '%.2f', + min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/storage/netapp/ontap/oncommandapi/mode/diskfailed.pm b/storage/netapp/ontap/oncommandapi/mode/diskfailed.pm index 6ba8e3680..e9f6ecd7f 100644 --- a/storage/netapp/ontap/oncommandapi/mode/diskfailed.pm +++ b/storage/netapp/ontap/oncommandapi/mode/diskfailed.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'failed' } ], output_template => 'Failed disks: %d', perfdatas => [ - { label => 'failed', value => 'failed_absolute', template => '%d', + { label => 'failed', value => 'failed', template => '%d', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'pre_failed' } ], output_template => 'Pre-failed disks: %d', perfdatas => [ - { label => 'pre_failed', value => 'pre_failed_absolute', template => '%d', + { label => 'pre_failed', value => 'pre_failed', template => '%d', min => 0 }, ], } diff --git a/storage/netapp/ontap/oncommandapi/mode/diskspare.pm b/storage/netapp/ontap/oncommandapi/mode/diskspare.pm index 49fa4ffb1..1db7c293e 100644 --- a/storage/netapp/ontap/oncommandapi/mode/diskspare.pm +++ b/storage/netapp/ontap/oncommandapi/mode/diskspare.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'spare' } ], output_template => 'Spare disks: %d', perfdatas => [ - { label => 'spare', value => 'spare_absolute', template => '%d', + { label => 'spare', value => 'spare', template => '%d', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'zeroed' } ], output_template => 'Zeroed disks: %d', perfdatas => [ - { label => 'zeroed', value => 'zeroed_absolute', template => '%d', + { label => 'zeroed', value => 'zeroed', template => '%d', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'not_zeroed' } ], output_template => 'Not zeroed disks: %d', perfdatas => [ - { label => 'not_zeroed', value => 'not_zeroed_absolute', template => '%d', + { label => 'not_zeroed', value => 'not_zeroed', template => '%d', min => 0 }, ], } diff --git a/storage/netapp/ontap/oncommandapi/mode/lunalignment.pm b/storage/netapp/ontap/oncommandapi/mode/lunalignment.pm index b2604736a..959cda854 100644 --- a/storage/netapp/ontap/oncommandapi/mode/lunalignment.pm +++ b/storage/netapp/ontap/oncommandapi/mode/lunalignment.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'aligned' } ], output_template => 'Luns aligned: %d', perfdatas => [ - { label => 'aligned', value => 'aligned_absolute', template => '%d', + { label => 'aligned', value => 'aligned', template => '%d', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'misaligned' } ], output_template => 'Luns misaligned: %d', perfdatas => [ - { label => 'misaligned', value => 'misaligned_absolute', template => '%d', + { label => 'misaligned', value => 'misaligned', template => '%d', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'possibly_misaligned' } ], output_template => 'Luns possibly misaligned: %d', perfdatas => [ - { label => 'possibly_misaligned', value => 'possibly_misaligned_absolute', template => '%d', + { label => 'possibly_misaligned', value => 'possibly_misaligned', template => '%d', min => 0 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'indeterminate' } ], output_template => 'Luns indeterminate: %d', perfdatas => [ - { label => 'indeterminate', value => 'indeterminate_absolute', template => '%d', + { label => 'indeterminate', value => 'indeterminate', template => '%d', min => 0 }, ], } @@ -73,7 +73,7 @@ sub set_counters { key_values => [ { name => 'partial_writes' } ], output_template => 'Luns partial writes: %d', perfdatas => [ - { label => 'partial_writes', value => 'partial_writes_absolute', template => '%d', + { label => 'partial_writes', value => 'partial_writes', template => '%d', min => 0 }, ], } @@ -82,7 +82,7 @@ sub set_counters { key_values => [ { name => 'not_mapped' } ], output_template => 'Luns not mapped: %d', perfdatas => [ - { label => 'not_mapped', value => 'not_mapped_absolute', template => '%d', + { label => 'not_mapped', value => 'not_mapped', template => '%d', min => 0 }, ], } diff --git a/storage/netapp/ontap/oncommandapi/mode/lunonline.pm b/storage/netapp/ontap/oncommandapi/mode/lunonline.pm index b587ebed7..bf3d917a2 100644 --- a/storage/netapp/ontap/oncommandapi/mode/lunonline.pm +++ b/storage/netapp/ontap/oncommandapi/mode/lunonline.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'online' } ], output_template => 'Luns online: %d', perfdatas => [ - { label => 'online', value => 'online_absolute', template => '%d', + { label => 'online', value => 'online', template => '%d', min => 0 }, ], } @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'not_online' } ], output_template => 'Luns not online: %d', perfdatas => [ - { label => 'not_online', value => 'not_online_absolute', template => '%d', + { label => 'not_online', value => 'not_online', template => '%d', min => 0 }, ], } @@ -55,7 +55,7 @@ sub set_counters { key_values => [ { name => 'mapped' } ], output_template => 'Luns mapped: %d', perfdatas => [ - { label => 'mapped', value => 'mapped_absolute', template => '%d', + { label => 'mapped', value => 'mapped', template => '%d', min => 0 }, ], } @@ -64,7 +64,7 @@ sub set_counters { key_values => [ { name => 'not_mapped' } ], output_template => 'Luns not mapped: %d', perfdatas => [ - { label => 'not_mapped', value => 'not_mapped_absolute', template => '%d', + { label => 'not_mapped', value => 'not_mapped', template => '%d', min => 0 }, ], } diff --git a/storage/netapp/ontap/oncommandapi/mode/nodehardwarestatus.pm b/storage/netapp/ontap/oncommandapi/mode/nodehardwarestatus.pm index 73cff9aa7..b0e14fe5c 100644 --- a/storage/netapp/ontap/oncommandapi/mode/nodehardwarestatus.pm +++ b/storage/netapp/ontap/oncommandapi/mode/nodehardwarestatus.pm @@ -74,8 +74,8 @@ sub set_counters { key_values => [ { name => 'failed_fan_count' }, { name => 'name' } ], output_template => '%d failed fan(s)', perfdatas => [ - { label => 'failed_fans', value => 'failed_fan_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'failed_fans', value => 'failed_fan_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -83,8 +83,8 @@ sub set_counters { key_values => [ { name => 'failed_power_supply_count' }, { name => 'name' } ], output_template => '%d failed psu', perfdatas => [ - { label => 'failed_psu', value => 'failed_power_supply_count_absolute', template => '%d', - min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'failed_psu', value => 'failed_power_supply_count', template => '%d', + min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/storage/netapp/ontap/oncommandapi/mode/snapmirrorusage.pm b/storage/netapp/ontap/oncommandapi/mode/snapmirrorusage.pm index b035117fd..6de1394c8 100644 --- a/storage/netapp/ontap/oncommandapi/mode/snapmirrorusage.pm +++ b/storage/netapp/ontap/oncommandapi/mode/snapmirrorusage.pm @@ -43,8 +43,8 @@ sub set_counters { key_values => [ { name => 'last_transfer_duration' }, { name => 'source_location' } ], output_template => 'Last transfer duration: %.2f s', perfdatas => [ - { label => 'last_transfer_duration', value => 'last_transfer_duration_absolute', template => '%.2f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'source_location_absolute' }, + { label => 'last_transfer_duration', value => 'last_transfer_duration', template => '%.2f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'source_location' }, ], } }, @@ -53,8 +53,8 @@ sub set_counters { output_template => 'Last transfer size: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'last_transfer_size', value => 'last_transfer_size_absolute', template => '%d', - min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'source_location_absolute' }, + { label => 'last_transfer_size', value => 'last_transfer_size', template => '%d', + min => 0, unit => 'B', label_extra_instance => 1, instance_use => 'source_location' }, ], } }, @@ -62,8 +62,8 @@ sub set_counters { key_values => [ { name => 'lag_time' }, { name => 'source_location' } ], output_template => 'Lag time: %.2f s', perfdatas => [ - { label => 'lag_time', value => 'lag_time_absolute', template => '%.2f', - min => 0, unit => 's', label_extra_instance => 1, instance_use => 'source_location_absolute' }, + { label => 'lag_time', value => 'lag_time', template => '%.2f', + min => 0, unit => 's', label_extra_instance => 1, instance_use => 'source_location' }, ], } }, diff --git a/storage/netapp/ontap/oncommandapi/mode/volumeio.pm b/storage/netapp/ontap/oncommandapi/mode/volumeio.pm index 674020deb..f9ebd0cb0 100644 --- a/storage/netapp/ontap/oncommandapi/mode/volumeio.pm +++ b/storage/netapp/ontap/oncommandapi/mode/volumeio.pm @@ -43,8 +43,8 @@ sub set_counters { key_values => [ { name => 'read_ops' }, { name => 'name' } ], output_template => 'Read IOPS: %.2f ops/s', perfdatas => [ - { label => 'read_iops', value => 'read_ops_absolute', template => '%.2f', - min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'read_iops', value => 'read_ops', template => '%.2f', + min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -52,8 +52,8 @@ sub set_counters { key_values => [ { name => 'write_ops' }, { name => 'name' } ], output_template => 'Write IOPS: %.2f ops/s', perfdatas => [ - { label => 'write_iops', value => 'write_ops_absolute', template => '%.2f', - min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'write_iops', value => 'write_ops', template => '%.2f', + min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -61,8 +61,8 @@ sub set_counters { key_values => [ { name => 'other_ops' }, { name => 'name' } ], output_template => 'Other IOPS: %.2f ops/s', perfdatas => [ - { label => 'other_iops', value => 'other_ops_absolute', template => '%.2f', - min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'other_iops', value => 'other_ops', template => '%.2f', + min => 0, unit => 'ops/s', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -70,8 +70,8 @@ sub set_counters { key_values => [ { name => 'avg_latency' }, { name => 'name' } ], output_template => 'Average latency: %.2f ms', perfdatas => [ - { label => 'avg_latency', value => 'avg_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'avg_latency', value => 'avg_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -79,8 +79,8 @@ sub set_counters { key_values => [ { name => 'read_latency' }, { name => 'name' } ], output_template => 'Read latency: %.2f ms', perfdatas => [ - { label => 'read_latency', value => 'read_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'read_latency', value => 'read_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -88,8 +88,8 @@ sub set_counters { key_values => [ { name => 'write_latency' }, { name => 'name' } ], output_template => 'Write latency: %.2f ms', perfdatas => [ - { label => 'write_latency', value => 'write_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'write_latency', value => 'write_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -97,8 +97,8 @@ sub set_counters { key_values => [ { name => 'other_latency' }, { name => 'name' } ], output_template => 'Other latency: %.2f ms', perfdatas => [ - { label => 'other_latency', value => 'other_latency_absolute', template => '%.2f', - min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'other_latency', value => 'other_latency', template => '%.2f', + min => 0, unit => 'ms', label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/storage/netapp/ontap/snmp/mode/cpstatistics.pm b/storage/netapp/ontap/snmp/mode/cpstatistics.pm index bf5d06254..a827424d0 100644 --- a/storage/netapp/ontap/snmp/mode/cpstatistics.pm +++ b/storage/netapp/ontap/snmp/mode/cpstatistics.pm @@ -38,7 +38,7 @@ sub set_counters { key_values => [ { name => 'timer', diff => 1 }, ], output_template => 'CP timer : %s', perfdatas => [ - { value => 'timer_absolute', template => '%d', min => 0 }, + { value => 'timer', template => '%d', min => 0 }, ], } }, @@ -46,7 +46,7 @@ sub set_counters { key_values => [ { name => 'snapshot', diff => 1 }, ], output_template => 'CP snapshot : %s', perfdatas => [ - { value => 'snapshot_absolute', template => '%d', min => 0 }, + { value => 'snapshot', template => '%d', min => 0 }, ], } }, @@ -54,7 +54,7 @@ sub set_counters { key_values => [ { name => 'lowerwater', diff => 1 }, ], output_template => 'CP low water mark : %s', perfdatas => [ - { value => 'lowerwater_absolute', template => '%d', min => 0 }, + { value => 'lowerwater', template => '%d', min => 0 }, ], } }, @@ -62,7 +62,7 @@ sub set_counters { key_values => [ { name => 'highwater', diff => 1 }, ], output_template => 'CP high water mark : %s', perfdatas => [ - { value => 'highwater_absolute', template => '%d', min => 0 }, + { value => 'highwater', template => '%d', min => 0 }, ], } }, @@ -70,7 +70,7 @@ sub set_counters { key_values => [ { name => 'logfull', diff => 1 }, ], output_template => 'CP nv-log full : %s', perfdatas => [ - { value => 'logfull_absolute', template => '%d', min => 0 }, + { value => 'logfull', template => '%d', min => 0 }, ], } }, @@ -78,7 +78,7 @@ sub set_counters { key_values => [ { name => 'back', diff => 1 }, ], output_template => 'CP back-to-back : %s', perfdatas => [ - { value => 'back_absolute', template => '%d', min => 0 }, + { value => 'back', template => '%d', min => 0 }, ], } }, @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'flush', diff => 1 }, ], output_template => 'CP flush unlogged write data : %s', perfdatas => [ - { value => 'flush_absolute', template => '%d', min => 0 }, + { value => 'flush', template => '%d', min => 0 }, ], } }, @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'sync', diff => 1 }, ], output_template => 'CP sync requests : %s', perfdatas => [ - { value => 'sync_absolute', template => '%d', min => 0 }, + { value => 'sync', template => '%d', min => 0 }, ], } }, @@ -102,7 +102,7 @@ sub set_counters { key_values => [ { name => 'lowvbuf', diff => 1 }, ], output_template => 'CP low virtual buffers : %s', perfdatas => [ - { value => 'lowvbuf_absolute', template => '%d', min => 0 }, + { value => 'lowvbuf', template => '%d', min => 0 }, ], } }, @@ -110,7 +110,7 @@ sub set_counters { key_values => [ { name => 'deferred', diff => 1 }, ], output_template => 'CP deferred : %s', perfdatas => [ - { value => 'deferred_absolute', template => '%d', min => 0 }, + { value => 'deferred', template => '%d', min => 0 }, ], } }, @@ -118,7 +118,7 @@ sub set_counters { key_values => [ { name => 'lowdatavecs', diff => 1 }, ], output_template => 'CP low datavecs : %s', perfdatas => [ - { value => 'lowdatavecs_absolute', template => '%d', min => 0 }, + { value => 'lowdatavecs', template => '%d', min => 0 }, ], } }, diff --git a/storage/netapp/ontap/snmp/mode/filesys.pm b/storage/netapp/ontap/snmp/mode/filesys.pm index b197795b9..2405bfe37 100644 --- a/storage/netapp/ontap/snmp/mode/filesys.pm +++ b/storage/netapp/ontap/snmp/mode/filesys.pm @@ -57,8 +57,8 @@ sub set_counters { key_values => [ { name => 'dfPerCentInodeCapacity' }, { name => 'display' } ], output_template => 'Inodes Used : %s %%', output_error_template => "Inodes : %s", perfdatas => [ - { label => 'inodes', value => 'dfPerCentInodeCapacity_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'inodes', value => 'dfPerCentInodeCapacity', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -66,8 +66,8 @@ sub set_counters { key_values => [ { name => 'dfCompressSavedPercent' }, { name => 'display' } ], output_template => 'Compress Saved : %s %%', output_error_template => "Compress Saved : %s", perfdatas => [ - { label => 'compresssaved', value => 'dfCompressSavedPercent_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'compresssaved', value => 'dfCompressSavedPercent', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -75,8 +75,8 @@ sub set_counters { key_values => [ { name => 'dfDedupeSavedPercent' }, { name => 'display' } ], output_template => 'Dedupe Saved : %s %%', output_error_template => "Dedupe Saved : %s", perfdatas => [ - { label => 'dedupsaved', value => 'dfDedupeSavedPercent_absolute', template => '%d', - unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'dedupsaved', value => 'dfDedupeSavedPercent', template => '%d', + unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/netapp/ontap/snmp/mode/globalstatus.pm b/storage/netapp/ontap/snmp/mode/globalstatus.pm index 7aead567f..e9ef13c99 100644 --- a/storage/netapp/ontap/snmp/mode/globalstatus.pm +++ b/storage/netapp/ontap/snmp/mode/globalstatus.pm @@ -35,27 +35,23 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'read', nlabel => 'storage.io.read.usage.bytespersecond', set => { - key_values => [ { name => 'read', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'read', per_second => 1 } ], output_template => 'Read I/O : %s %s/s', output_change_bytes => 1, perfdatas => [ - { value => 'read_per_second', template => '%d', - unit => 'B/s', min => 0 }, - ], + { template => '%d', unit => 'B/s', min => 0 } + ] } }, { label => 'write', nlabel => 'storage.io.write.usage.bytespersecond', set => { - key_values => [ { name => 'write', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'write', per_second => 1 } ], output_template => 'Write I/O : %s %s/s', output_change_bytes => 1, perfdatas => [ - { value => 'write_per_second', template => '%d', - unit => 'B/s', min => 0 }, - ], + { template => '%d', unit => 'B/s', min => 0 } + ] } - }, + } ]; } diff --git a/storage/netapp/ontap/snmp/mode/sharecalls.pm b/storage/netapp/ontap/snmp/mode/sharecalls.pm index f524fdfe6..e49294528 100644 --- a/storage/netapp/ontap/snmp/mode/sharecalls.pm +++ b/storage/netapp/ontap/snmp/mode/sharecalls.pm @@ -35,23 +35,21 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'cifs', nlabel => 'storage.cifs.calls.persecond', set => { - key_values => [ { name => 'cifs', diff => 1 }, ], - per_second => 1, + key_values => [ { name => 'cifs', per_second => 1 } ], output_template => 'CIFS : %s calls/s', perfdatas => [ - { value => 'cifs_per_second', template => '%d', min => 0 }, - ], + { template => '%d', min => 0 } + ] } }, { label => 'nfs', nlabel => 'storage.nfs.calls.persecond', set => { - key_values => [ { name => 'nfs', diff => 1 }, ], - per_second => 1, + key_values => [ { name => 'nfs', per_second => 1 } ], output_template => 'NFS : %s calls/s', perfdatas => [ - { value => 'nfs_per_second', template => '%d', min => 0 }, - ], + { template => '%d', min => 0 } + ] } - }, + } ]; } diff --git a/storage/netapp/ontap/snmp/mode/snapmirrorlag.pm b/storage/netapp/ontap/snmp/mode/snapmirrorlag.pm index da872b363..4277e53d6 100644 --- a/storage/netapp/ontap/snmp/mode/snapmirrorlag.pm +++ b/storage/netapp/ontap/snmp/mode/snapmirrorlag.pm @@ -55,8 +55,8 @@ sub set_counters { key_values => [ { name => 'lag' }, { name => 'display' } ], output_template => 'lag: %s seconds', perfdatas => [ - { label => 'lag', value => 'lag_absolute', template => '%s', min => 0, unit => 's', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'lag', value => 'lag', template => '%s', min => 0, unit => 's', + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/netapp/ontap/snmp/mode/snapvaultusage.pm b/storage/netapp/ontap/snmp/mode/snapvaultusage.pm index e39bc7c0c..72949c045 100644 --- a/storage/netapp/ontap/snmp/mode/snapvaultusage.pm +++ b/storage/netapp/ontap/snmp/mode/snapvaultusage.pm @@ -63,18 +63,18 @@ sub set_counters { key_values => [ { name => 'svLag' }, { name => 'display' } ], output_template => 'lag : %s seconds', perfdatas => [ - { label => 'lag', value => 'svLag_absolute', template => '%s', min => 0, unit => 's', - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'lag', template => '%s', min => 0, unit => 's', + label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'transfer-traffic', set => { - key_values => [ { name => 'svTotalTransMBs', diff => 1 }, { name => 'display' } ], - per_second => 1, output_change_bytes => 1, + key_values => [ { name => 'svTotalTransMBs', per_second => 1 }, { name => 'display' } ], output_template => 'transfer traffic : %s %s/s', + output_change_bytes => 1, perfdatas => [ - { label => 'transfer_traffic', template => '%.2f', value => 'svTotalTransMBs_per_second', - unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'transfer_traffic', template => '%.2f', + unit => 'B/s', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -82,8 +82,8 @@ sub set_counters { key_values => [ { name => 'svTotalSuccesses' }, { name => 'display' } ], output_template => 'transfer succeed : %s', perfdatas => [ - { label => 'transfer_succeed', value => 'svTotalSuccesses_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'transfer_succeed', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -91,8 +91,8 @@ sub set_counters { key_values => [ { name => 'svTotalFailures' }, { name => 'display' } ], output_template => 'transfer failed : %s', perfdatas => [ - { label => 'transfer_failed', value => 'svTotalFailures_absolute', template => '%s', min => 0, - label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'transfer_failed', template => '%s', min => 0, + label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/netapp/ontap/snmp/mode/volumeoptions.pm b/storage/netapp/ontap/snmp/mode/volumeoptions.pm index 5bef56586..1cea6ed95 100644 --- a/storage/netapp/ontap/snmp/mode/volumeoptions.pm +++ b/storage/netapp/ontap/snmp/mode/volumeoptions.pm @@ -86,7 +86,7 @@ sub set_counters { key_values => [ { name => 'failed' } ], output_template => 'Failed: %s', perfdatas => [ - { label => 'failed', value => 'failed_absolute', template => '%s', min => 0 }, + { label => 'failed', value => 'failed', template => '%s', min => 0 }, ], } }, diff --git a/storage/netapp/santricity/restapi/mode/storagecontrollers.pm b/storage/netapp/santricity/restapi/mode/storagecontrollers.pm index b8af42419..6fc59d935 100644 --- a/storage/netapp/santricity/restapi/mode/storagecontrollers.pm +++ b/storage/netapp/santricity/restapi/mode/storagecontrollers.pm @@ -75,52 +75,44 @@ sub set_counters { } }, { label => 'cpu-utilization', nlabel => 'volume.cpu.utilization.percentage', set => { - key_values => [ { name => 'cpu_util', diff => 1 }, { name => 'display' } ], - per_second => 1, + key_values => [ { name => 'cpu_util', per_second => 1 }, { name => 'display' } ], output_template => 'cpu usage: %.2f %%', perfdatas => [ - { value => 'cpu_util_per_second', template => '%d', - unit => '%', label_extra_instance => 1 } + { template => '%d', unit => '%', label_extra_instance => 1 } ] } }, { label => 'read', nlabel => 'volume.io.read.usage.bytespersecond', set => { - key_values => [ { name => 'read_bytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'read_bytes', per_second => 1 }, { name => 'display' } ], output_template => 'read: %s %s/s', - per_second => 1, output_change_bytes => 1, + output_change_bytes => 1, perfdatas => [ - { value => 'read_bytes_per_second', template => '%d', - unit => 'B/s', label_extra_instance => 1 } + { template => '%d', unit => 'B/s', label_extra_instance => 1 } ] } }, { label => 'write', nlabel => 'volume.io.write.usage.bytespersecond', set => { - key_values => [ { name => 'write_bytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'write_bytes', per_second => 1 }, { name => 'display' } ], output_template => 'write: %s %s/s', - per_second => 1, output_change_bytes => 1, + output_change_bytes => 1, perfdatas => [ - { value => 'write_bytes_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1 } + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1 } ] } }, { label => 'read-iops', nlabel => 'system.io.read.usage.iops', set => { - key_values => [ { name => 'read_iops', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'read_iops', per_second => 1 }, { name => 'display' } ], output_template => 'read: %.2f iops', - per_second => 1, perfdatas => [ - { value => 'read_iops_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1 } + { template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1 } ] } }, { label => 'write-iops', nlabel => 'system.io.write.usage.iops', set => { - key_values => [ { name => 'write_iops', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'write_iops', per_second => 1 }, { name => 'display' } ], output_template => 'write: %.2f iops', - per_second => 1, perfdatas => [ - { value => 'write_iops_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1 } + { template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1 } ] } } diff --git a/storage/netapp/santricity/restapi/mode/storagesystems.pm b/storage/netapp/santricity/restapi/mode/storagesystems.pm index a1ca67925..5c2b4cf1d 100644 --- a/storage/netapp/santricity/restapi/mode/storagesystems.pm +++ b/storage/netapp/santricity/restapi/mode/storagesystems.pm @@ -38,14 +38,14 @@ sub custom_status_output { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space}); my $msg = sprintf( 'space usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space} ); return $msg; } @@ -76,7 +76,7 @@ sub set_counters { key_values => [ { name => 'used_space' }, { name => 'free_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', + { value => 'used_space', template => '%d', min => 0, max => 'total_space', unit => 'B', cast_int => 1, label_extra_instance => 1 } ] } @@ -85,7 +85,7 @@ sub set_counters { key_values => [ { name => 'free_space' }, { name => 'used_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', + { value => 'free_space', template => '%d', min => 0, max => 'total_space', unit => 'B', cast_int => 1, label_extra_instance => 1 } ] } @@ -94,7 +94,7 @@ sub set_counters { key_values => [ { name => 'prct_used_space' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { value => 'prct_used_space_absolute', template => '%.2f', min => 0, max => 100, + { value => 'prct_used_space', template => '%.2f', min => 0, max => 100, unit => '%', label_extra_instance => 1 } ] } diff --git a/storage/netapp/santricity/restapi/mode/storagevolumes.pm b/storage/netapp/santricity/restapi/mode/storagevolumes.pm index 544ef1b40..2d61a8082 100644 --- a/storage/netapp/santricity/restapi/mode/storagevolumes.pm +++ b/storage/netapp/santricity/restapi/mode/storagevolumes.pm @@ -75,42 +75,36 @@ sub set_counters { } }, { label => 'read', nlabel => 'volume.io.read.usage.bytespersecond', set => { - key_values => [ { name => 'read_bytes', diff => 1 }, { name => 'display' } ], - per_second => 1, - output_change_bytes => 1, output_template => 'read: %s %s/s', + key_values => [ { name => 'read_bytes', per_second => 1 }, { name => 'display' } ], + output_template => 'read: %s %s/s', + output_change_bytes => 1, perfdatas => [ - { value => 'read_bytes_per_second', template => '%d', - unit => 'B/s', label_extra_instance => 1 } + { template => '%d', unit => 'B/s', label_extra_instance => 1 } ] } }, { label => 'write', nlabel => 'volume.io.write.usage.bytespersecond', set => { - key_values => [ { name => 'write_bytes', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'write_bytes', per_second => 1 }, { name => 'display' } ], output_template => 'write: %s %s/s', - per_second => 1, output_change_bytes => 1, + output_change_bytes => 1, perfdatas => [ - { value => 'write_bytes_per_second', template => '%d', - unit => 'B/s', min => 0, label_extra_instance => 1 } + { template => '%d', unit => 'B/s', min => 0, label_extra_instance => 1 } ] } }, { label => 'read-iops', nlabel => 'system.io.read.usage.iops', set => { - key_values => [ { name => 'read_iops', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'read_iops', per_second => 1 }, { name => 'display' } ], output_template => 'read: %.2f iops', - per_second => 1, perfdatas => [ - { value => 'read_iops_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1 } + { template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1 } ] } }, { label => 'write-iops', nlabel => 'system.io.write.usage.iops', set => { - key_values => [ { name => 'write_iops', diff => 1 }, { name => 'display' } ], + key_values => [ { name => 'write_iops', per_second => 1 }, { name => 'display' } ], output_template => 'write: %.2f iops', - per_second => 1, perfdatas => [ - { value => 'write_iops_per_second', template => '%.2f', - unit => 'iops', min => 0, label_extra_instance => 1 } + { template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1 } ] } } diff --git a/storage/nimble/snmp/mode/globalstats.pm b/storage/nimble/snmp/mode/globalstats.pm index 126b7b5ba..be3d3b65d 100644 --- a/storage/nimble/snmp/mode/globalstats.pm +++ b/storage/nimble/snmp/mode/globalstats.pm @@ -35,44 +35,36 @@ sub set_counters { $self->{maps_counters}->{global} = [ { label => 'read', nlabel => 'system.io.read.usage.bytespersecond', set => { - key_values => [ { name => 'read', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'read', per_second => 1 } ], output_template => 'Read I/O : %s %s/s', output_error_template => "Read I/O : %s", output_change_bytes => 1, perfdatas => [ - { label => 'read', value => 'read_per_second', template => '%d', - unit => 'B/s' }, + { label => 'read', template => '%d', unit => 'B/s' }, ], } }, { label => 'write', nlabel => 'system.io.write.usage.bytespersecond', set => { - key_values => [ { name => 'write', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'write', per_second => 1 } ], output_template => 'Write I/O : %s %s/s', output_error_template => "Write I/O : %s", output_change_bytes => 1, perfdatas => [ - { label => 'write', value => 'write_per_second', template => '%d', - unit => 'B/s', min => 0 }, + { label => 'write', template => '%d', unit => 'B/s', min => 0 }, ], } }, { label => 'read-iops', nlabel => 'system.io.read.usage.iops', set => { - key_values => [ { name => 'read_iops', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'read_iops', per_second => 1 } ], output_template => 'Read IOPs : %.2f', output_error_template => "Read IOPs : %s", perfdatas => [ - { label => 'read_iops', value => 'read_iops_per_second', template => '%.2f', - unit => 'iops', min => 0 }, + { label => 'read_iops', template => '%.2f', unit => 'iops', min => 0 }, ], } }, { label => 'write-iops', nlabel => 'system.io.write.usage.iops', set => { - key_values => [ { name => 'write_iops', diff => 1 } ], - per_second => 1, + key_values => [ { name => 'write_iops', per_second => 1 } ], output_template => 'Write IOPs : %.2f', output_error_template => "Write IOPs : %s", perfdatas => [ - { label => 'write_iops', value => 'write_iops_per_second', template => '%.2f', - unit => 'iops', min => 0 }, + { label => 'write_iops', template => '%.2f', unit => 'iops', min => 0 }, ], } }, @@ -80,8 +72,7 @@ sub set_counters { key_values => [ { name => 'read_time', diff => 1 } ], output_template => 'Read Time : %.3f s', output_error_template => "Read Time : %s", perfdatas => [ - { label => 'read_time', value => 'read_time_absolute', template => '%.3f', - unit => 's', min => 0 }, + { label => 'read_time', template => '%.3f', unit => 's', min => 0 }, ], } }, @@ -89,8 +80,7 @@ sub set_counters { key_values => [ { name => 'write_time', diff => 1 } ], output_template => 'Write Time : %.3f s', output_error_template => "Write Time : %s", perfdatas => [ - { label => 'write_time', value => 'write_time_absolute', template => '%.3f', - unit => 's', min => 0 }, + { label => 'write_time', template => '%.3f', unit => 's', min => 0 }, ], } }, diff --git a/storage/oracle/zs/restapi/mode/pools.pm b/storage/oracle/zs/restapi/mode/pools.pm index c7bcc5fc3..bb48c40d8 100644 --- a/storage/oracle/zs/restapi/mode/pools.pm +++ b/storage/oracle/zs/restapi/mode/pools.pm @@ -36,13 +36,13 @@ sub custom_status_output { sub custom_usage_output { my ($self, %options) = @_; - my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute}); - my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute}); - my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute}); + my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space}); + my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space}); + my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space}); my $msg = sprintf('space usage total: %s used: %s (%.2f%%) free: %s (%.2f%%)', $total_size_value . " " . $total_size_unit, - $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space_absolute}, - $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute} + $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used_space}, + $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space} ); return $msg; } @@ -67,8 +67,8 @@ sub set_counters { key_values => [ { name => 'used_space' }, { name => 'free_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'used_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'used_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -76,8 +76,8 @@ sub set_counters { key_values => [ { name => 'free_space' }, { name => 'used_space' }, { name => 'prct_used_space' }, { name => 'prct_free_space' }, { name => 'total_space' }, { name => 'display' }, ], closure_custom_output => $self->can('custom_usage_output'), perfdatas => [ - { value => 'free_space_absolute', template => '%d', min => 0, max => 'total_space_absolute', - unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'free_space', template => '%d', min => 0, max => 'total_space', + unit => 'B', cast_int => 1, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -85,8 +85,8 @@ sub set_counters { key_values => [ { name => 'prct_used_space' }, { name => 'display' } ], output_template => 'used : %.2f %%', perfdatas => [ - { value => 'prct_used_space_absolute', template => '%.2f', min => 0, max => 100, - unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' }, + { value => 'prct_used_space', template => '%.2f', min => 0, max => 100, + unit => '%', label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/panzura/snmp/mode/ratios.pm b/storage/panzura/snmp/mode/ratios.pm index 4f0cf53b7..4c8a795b7 100644 --- a/storage/panzura/snmp/mode/ratios.pm +++ b/storage/panzura/snmp/mode/ratios.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'dedup' }, ], output_template => 'Deduplication ratio : %.2f', perfdatas => [ - { value => 'dedup_absolute', template => '%.2f', min => 0 }, + { value => 'dedup', template => '%.2f', min => 0 }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'comp' }, ], output_template => 'Compression ratio : %.2f', perfdatas => [ - { value => 'comp_absolute', template => '%.2f', min => 0 }, + { value => 'comp', template => '%.2f', min => 0 }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'save' }, ], output_template => 'Save ratio : %.2f', perfdatas => [ - { value => 'save_absolute', template => '%.2f', min => 0 }, + { value => 'save', template => '%.2f', min => 0 }, ], } }, diff --git a/storage/purestorage/restapi/mode/pgroupreplication.pm b/storage/purestorage/restapi/mode/pgroupreplication.pm index c7510aa12..6692f1efa 100644 --- a/storage/purestorage/restapi/mode/pgroupreplication.pm +++ b/storage/purestorage/restapi/mode/pgroupreplication.pm @@ -39,28 +39,28 @@ sub set_counters { key_values => [ { name => 'progress' }, { name => 'display' } ], output_template => 'Progress : %s %%', perfdatas => [ - { label => 'progress', value => 'progress_absolute', template => '%s', unit => '%', - min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'progress', value => 'progress', template => '%s', unit => '%', + min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'creation', set => { key_values => [ { name => 'creation_human' }, { name => 'creation_seconds' }, { name => 'display' } ], - threshold_use => 'creation_seconds_absolute', + threshold_use => 'creation_seconds', output_template => 'Creation Time : %s', perfdatas => [ - { label => 'creation', value => 'creation_seconds_absolute', template => '%d', - unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'creation', value => 'creation_seconds', template => '%d', + unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, { label => 'duration', set => { key_values => [ { name => 'duration_human' }, { name => 'duration_seconds' }, { name => 'display' } ], - threshold_use => 'duration_seconds_absolute', + threshold_use => 'duration_seconds', output_template => 'Duration : %s', perfdatas => [ - { label => 'duration', value => 'duration_seconds_absolute', template => '%d', - unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'duration', value => 'duration_seconds', template => '%d', + unit => 's', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -69,8 +69,8 @@ sub set_counters { output_template => 'Physical Bytes Written : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'physical_bytes_written', value => 'physical_bytes_written_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'physical_bytes_written', value => 'physical_bytes_written', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -79,8 +79,8 @@ sub set_counters { output_template => 'Data Transferred : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'data_transferred', value => 'data_transferred_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'data_transferred', value => 'data_transferred', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/purestorage/restapi/mode/volumeusage.pm b/storage/purestorage/restapi/mode/volumeusage.pm index cdcd97484..b5759798d 100644 --- a/storage/purestorage/restapi/mode/volumeusage.pm +++ b/storage/purestorage/restapi/mode/volumeusage.pm @@ -111,8 +111,8 @@ sub set_counters { key_values => [ { name => 'data_reduction' }, { name => 'display' } ], output_template => 'Data Reduction : %.3f', perfdatas => [ - { label => 'data_reduction', value => 'data_reduction_absolute', template => '%.3f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'data_reduction', value => 'data_reduction', template => '%.3f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -120,8 +120,8 @@ sub set_counters { key_values => [ { name => 'total_reduction' }, { name => 'display' } ], output_template => 'Total Reduction : %.3f', perfdatas => [ - { label => 'total_reduction', value => 'total_reduction_absolute', template => '%.3f', - min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'total_reduction', value => 'total_reduction', template => '%.3f', + min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, @@ -130,8 +130,8 @@ sub set_counters { output_template => 'Snapshots : %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'snapshots', value => 'snapshots_absolute', template => '%s', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, + { label => 'snapshots', value => 'snapshots', template => '%s', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'display' }, ], } }, diff --git a/storage/purestorage/snmp/mode/stats.pm b/storage/purestorage/snmp/mode/stats.pm index 506a261d0..34f3fcdfe 100644 --- a/storage/purestorage/snmp/mode/stats.pm +++ b/storage/purestorage/snmp/mode/stats.pm @@ -38,7 +38,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Read Bandwith : %s %s/s', perfdatas => [ - { label => 'read_bandwidth', value => 'pureArrayReadBandwidth_absolute', template => '%.2f', + { label => 'read_bandwidth', value => 'pureArrayReadBandwidth', template => '%.2f', min => 0, unit => 'b/s' }, ], } @@ -48,7 +48,7 @@ sub set_counters { output_change_bytes => 2, output_template => 'Write Bandwith : %s %s/s', perfdatas => [ - { label => 'write_bandwidth', value => 'pureArrayWriteBandwidth_absolute', template => '%.2f', + { label => 'write_bandwidth', value => 'pureArrayWriteBandwidth', template => '%.2f', min => 0, unit => 'b/s' }, ], } @@ -57,7 +57,7 @@ sub set_counters { key_values => [ { name => 'pureArrayReadIOPS' } ], output_template => 'Read IOPs : %s', perfdatas => [ - { label => 'read_iops', value => 'pureArrayReadIOPS_absolute', template => '%s', + { label => 'read_iops', value => 'pureArrayReadIOPS', template => '%s', unit => 'iops', min => 0 }, ], } @@ -66,7 +66,7 @@ sub set_counters { key_values => [ { name => 'pureArrayWriteIOPS' } ], output_template => 'Write IOPs : %s', perfdatas => [ - { label => 'write_iops', value => 'pureArrayWriteIOPS_absolute', template => '%s', + { label => 'write_iops', value => 'pureArrayWriteIOPS', template => '%s', unit => 'iops', min => 0 }, ], } @@ -75,7 +75,7 @@ sub set_counters { key_values => [ { name => 'pureArrayReadLatency' } ], output_template => 'Read Latency : %s us/op', perfdatas => [ - { label => 'read_latency', value => 'pureArrayReadLatency_absolute', template => '%s', + { label => 'read_latency', value => 'pureArrayReadLatency', template => '%s', unit => 'us/op', min => 0 }, ], } @@ -84,7 +84,7 @@ sub set_counters { key_values => [ { name => 'pureArrayWriteLatency' } ], output_template => 'Write Latency : %s us/op', perfdatas => [ - { label => 'write_latency', value => 'pureArrayWriteLatency_absolute', template => '%s', + { label => 'write_latency', value => 'pureArrayWriteLatency', template => '%s', unit => 'us/op', min => 0 }, ], } diff --git a/storage/quantum/dxi/ssh/mode/compaction.pm b/storage/quantum/dxi/ssh/mode/compaction.pm index aceea5e4d..74d6fa07e 100644 --- a/storage/quantum/dxi/ssh/mode/compaction.pm +++ b/storage/quantum/dxi/ssh/mode/compaction.pm @@ -96,7 +96,7 @@ sub set_counters { key_values => [ { name => 'status_progress' } ], output_template => 'Status progress: %.2f %%', perfdatas => [ - { label => 'status_progress', value => 'status_progress_absolute', template => '%.2f', + { label => 'status_progress', value => 'status_progress', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/storage/quantum/dxi/ssh/mode/dedupnas.pm b/storage/quantum/dxi/ssh/mode/dedupnas.pm index da013a0b5..ecd4e3922 100644 --- a/storage/quantum/dxi/ssh/mode/dedupnas.pm +++ b/storage/quantum/dxi/ssh/mode/dedupnas.pm @@ -91,8 +91,8 @@ sub set_counters { output_template => 'Original data size: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'original_data_size', value => 'original_size_absolute', template => '%d', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'original_data_size', value => 'original_size', template => '%d', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -101,8 +101,8 @@ sub set_counters { output_template => 'Sent data size: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'sent_data_size', value => 'sent_size_absolute', template => '%d', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'sent_data_size', value => 'sent_size', template => '%d', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/storage/quantum/dxi/ssh/mode/dedupvtl.pm b/storage/quantum/dxi/ssh/mode/dedupvtl.pm index 2cc2e19df..57994d11a 100644 --- a/storage/quantum/dxi/ssh/mode/dedupvtl.pm +++ b/storage/quantum/dxi/ssh/mode/dedupvtl.pm @@ -92,8 +92,8 @@ sub set_counters { output_template => 'Original data size: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'original_data_size', value => 'original_size_absolute', template => '%d', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'original_data_size', value => 'original_size', template => '%d', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, @@ -102,8 +102,8 @@ sub set_counters { output_template => 'Sent data size: %s %s', output_change_bytes => 1, perfdatas => [ - { label => 'sent_data_size', value => 'sent_size_absolute', template => '%d', - unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name_absolute' }, + { label => 'sent_data_size', value => 'sent_size', template => '%d', + unit => 'B', min => 0, label_extra_instance => 1, instance_use => 'name' }, ], } }, diff --git a/storage/quantum/dxi/ssh/mode/reclamation.pm b/storage/quantum/dxi/ssh/mode/reclamation.pm index 11e2006a0..28213b5a1 100644 --- a/storage/quantum/dxi/ssh/mode/reclamation.pm +++ b/storage/quantum/dxi/ssh/mode/reclamation.pm @@ -97,7 +97,7 @@ sub set_counters { key_values => [ { name => 'stage_status_progress' } ], output_template => 'Stage Status progress: %.2f %%', perfdatas => [ - { label => 'stage_status_progress', value => 'stage_status_progress_absolute', template => '%.2f', + { label => 'stage_status_progress', value => 'stage_status_progress', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -106,7 +106,7 @@ sub set_counters { key_values => [ { name => 'total_progress' } ], output_template => 'Total progress: %.2f %%', perfdatas => [ - { label => 'total_progress', value => 'total_progress_absolute', template => '%.2f', + { label => 'total_progress', value => 'total_progress', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/storage/quantum/dxi/ssh/mode/reduction.pm b/storage/quantum/dxi/ssh/mode/reduction.pm index e76854e6d..53bb4456e 100644 --- a/storage/quantum/dxi/ssh/mode/reduction.pm +++ b/storage/quantum/dxi/ssh/mode/reduction.pm @@ -147,7 +147,7 @@ sub set_counters { key_values => [ { name => 'total_reduction_ratio' } ], output_template => 'Total Reduction Ratio: %.2f', perfdatas => [ - { label => 'total_reduction_ratio', value => 'total_reduction_ratio_absolute', template => '%.2f', + { label => 'total_reduction_ratio', value => 'total_reduction_ratio', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -156,7 +156,7 @@ sub set_counters { key_values => [ { name => 'deduplication_ratio' } ], output_template => 'Deduplication Ratio: %.2f', perfdatas => [ - { label => 'deduplication_ratio', value => 'deduplication_ratio_absolute', template => '%.2f', + { label => 'deduplication_ratio', value => 'deduplication_ratio', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } @@ -165,7 +165,7 @@ sub set_counters { key_values => [ { name => 'compression_ratio' } ], output_template => 'Compression Ratio: %.2f', perfdatas => [ - { label => 'compression_ratio', value => 'compression_ratio_absolute', template => '%.2f', + { label => 'compression_ratio', value => 'compression_ratio', template => '%.2f', unit => '%', min => 0, max => 100 }, ], } diff --git a/storage/synology/snmp/mode/ha.pm b/storage/synology/snmp/mode/ha.pm index 5987e5b6b..920b43a79 100644 --- a/storage/synology/snmp/mode/ha.pm +++ b/storage/synology/snmp/mode/ha.pm @@ -61,7 +61,7 @@ sub set_counters { key_values => [ { name => 'heartbeat_latency' } ], output_template => 'heartbeat latency: %s us', perfdatas => [ - { value => 'heartbeat_latency_absolute', template => '%s', min => 0, unit => 'us' } + { value => 'heartbeat_latency', template => '%s', min => 0, unit => 'us' } ] } } diff --git a/storage/synology/snmp/mode/temperature.pm b/storage/synology/snmp/mode/temperature.pm index f97aead39..0af9d9bf0 100644 --- a/storage/synology/snmp/mode/temperature.pm +++ b/storage/synology/snmp/mode/temperature.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'temperature' } ], output_template => 'system temperature: %s C', perfdatas => [ - { value => 'temperature_absolute', template => '%s', unit => 'C' }, + { value => 'temperature', template => '%s', unit => 'C' }, ], } }, diff --git a/storage/synology/snmp/mode/ups.pm b/storage/synology/snmp/mode/ups.pm index 185808759..cb448e203 100644 --- a/storage/synology/snmp/mode/ups.pm +++ b/storage/synology/snmp/mode/ups.pm @@ -37,7 +37,7 @@ sub set_counters { key_values => [ { name => 'ups_load' } ], output_template => 'ups load: %s%%', perfdatas => [ - { value => 'ups_load_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { value => 'ups_load', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, @@ -45,7 +45,7 @@ sub set_counters { key_values => [ { name => 'charge_remain' } ], output_template => 'battery charge remaining: %s%%', perfdatas => [ - { value => 'charge_remain_absolute', template => '%s', min => 0, max => 100, unit => '%' }, + { value => 'charge_remain', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, @@ -53,7 +53,7 @@ sub set_counters { key_values => [ { name => 'lifetime_remain' } ], output_template => 'battery estimated lifetime: %s seconds', perfdatas => [ - { value => 'lifetime_remain_absolute', template => '%s', min => 0, unit => 's' }, + { value => 'lifetime_remain', template => '%s', min => 0, unit => 's' }, ], } },