From a5fd7fb3a7b522268893efa67ab5843445d0bb01 Mon Sep 17 00:00:00 2001 From: Colin Gagnaire Date: Fri, 7 Jun 2019 14:26:29 +0200 Subject: [PATCH] adjust prometheus kubernetes perfdata --- .../direct/kubernetes/mode/containerstatus.pm | 2 +- .../direct/kubernetes/mode/daemonsetstatus.pm | 16 ++++++++-------- .../direct/kubernetes/mode/deploymentstatus.pm | 10 +++++----- .../direct/kubernetes/mode/namespacestatus.pm | 4 ++-- .../direct/kubernetes/mode/nodestatus.pm | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm b/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm index d10ec2f73..0c75fc6ed 100644 --- a/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm +++ b/cloud/prometheus/direct/kubernetes/mode/containerstatus.pm @@ -68,7 +68,7 @@ sub set_counters { closure_custom_threshold_check => \&catalog_status_threshold, } }, - { label => 'restarts-count', nlabel => 'kubernetes.container.restarts.count', set => { + { label => 'restarts-count', nlabel => 'containers.restarts.count', set => { key_values => [ { name => 'restarts' }, { name => 'perf' } ], output_template => 'Restarts count : %d', perfdatas => [ diff --git a/cloud/prometheus/direct/kubernetes/mode/daemonsetstatus.pm b/cloud/prometheus/direct/kubernetes/mode/daemonsetstatus.pm index 749d86f88..097dbc039 100644 --- a/cloud/prometheus/direct/kubernetes/mode/daemonsetstatus.pm +++ b/cloud/prometheus/direct/kubernetes/mode/daemonsetstatus.pm @@ -28,46 +28,46 @@ use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold) sub custom_status_perfdata { my ($self, %options) = @_; - + $self->{output}->perfdata_add( label => 'desired', - nlabel => 'kubernetes.daemonset.nodes.desired.count', + nlabel => 'daemonset.nodes.desired.count', value => $self->{result_values}->{desired}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'current', - nlabel => 'kubernetes.daemonset.nodes.current.count', + nlabel => 'daemonset.nodes.current.count', value => $self->{result_values}->{current}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'available', - nlabel => 'kubernetes.daemonset.nodes.available.count', + nlabel => 'daemonset.nodes.available.count', value => $self->{result_values}->{available}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'unavailable', - nlabel => 'kubernetes.daemonset.nodes.unavailable.count', + nlabel => 'daemonset.nodes.unavailable.count', value => $self->{result_values}->{unavailable}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'up_to_date', - nlabel => 'kubernetes.daemonset.nodes.uptodate.count', + nlabel => 'daemonset.nodes.uptodate.count', value => $self->{result_values}->{up_to_date}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'ready', - nlabel => 'kubernetes.daemonset.nodes.ready.count', + nlabel => 'daemonset.nodes.ready.count', value => $self->{result_values}->{ready}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'misscheduled', - nlabel => 'kubernetes.daemonset.nodes.misscheduled.count', + nlabel => 'daemonset.nodes.misscheduled.count', value => $self->{result_values}->{misscheduled}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); diff --git a/cloud/prometheus/direct/kubernetes/mode/deploymentstatus.pm b/cloud/prometheus/direct/kubernetes/mode/deploymentstatus.pm index 245f7d97f..014f26375 100644 --- a/cloud/prometheus/direct/kubernetes/mode/deploymentstatus.pm +++ b/cloud/prometheus/direct/kubernetes/mode/deploymentstatus.pm @@ -31,31 +31,31 @@ sub custom_status_perfdata { $self->{output}->perfdata_add( label => 'desired', - nlabel => 'kubernetes.deployment.replicas.desired.count', + nlabel => 'deployment.replicas.desired.count', value => $self->{result_values}->{desired}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'current', - nlabel => 'kubernetes.deployment.replicas.current.count', + nlabel => 'deployment.replicas.current.count', value => $self->{result_values}->{current}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'available', - nlabel => 'kubernetes.deployment.replicas.available.count', + nlabel => 'deployment.replicas.available.count', value => $self->{result_values}->{available}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'unavailable', - nlabel => 'kubernetes.deployment.replicas.unavailable.count', + nlabel => 'deployment.replicas.unavailable.count', value => $self->{result_values}->{unavailable}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); $self->{output}->perfdata_add( label => 'up_to_date', - nlabel => 'kubernetes.deployment.replicas.uptodate.count', + nlabel => 'deployment.replicas.uptodate.count', value => $self->{result_values}->{up_to_date}, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, ); diff --git a/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm b/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm index b838ecb6a..a156c7fad 100644 --- a/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm +++ b/cloud/prometheus/direct/kubernetes/mode/namespacestatus.pm @@ -51,7 +51,7 @@ sub set_counters { ]; $self->{maps_counters}->{global} = [ - { label => 'active', nlabel => 'kubernetes.namespace.active.count', set => { + { label => 'active', nlabel => 'namespaces.active.count', set => { key_values => [ { name => 'active' } ], output_template => 'Active : %d', perfdatas => [ @@ -60,7 +60,7 @@ sub set_counters { ], } }, - { label => 'terminating', nlabel => 'kubernetes.namespace.terminating.count', set => { + { label => 'terminating', nlabel => 'namespaces.terminating.count', set => { key_values => [ { name => 'terminating' } ], output_template => 'Terminating : %d', perfdatas => [ diff --git a/cloud/prometheus/direct/kubernetes/mode/nodestatus.pm b/cloud/prometheus/direct/kubernetes/mode/nodestatus.pm index af9dc4a9f..46e580ac5 100644 --- a/cloud/prometheus/direct/kubernetes/mode/nodestatus.pm +++ b/cloud/prometheus/direct/kubernetes/mode/nodestatus.pm @@ -58,7 +58,7 @@ sub custom_usage_perfdata { $self->{output}->perfdata_add( label => $label, - nlabel => 'kubernetes.pods.allocated.count', + nlabel => 'pods.allocated.count', value => $value_perf, warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}, %total_options), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}, %total_options),