From f95b03869bb4c01a7f04ee5f17a3f884b7a96234 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 24 Aug 2016 16:29:06 +0200 Subject: [PATCH] Fix Pacemaker metric names Change-Id: I08215ed71b61afa8550bc05933d9cba19a61f884 --- .../lma_collector/files/collectd/collectd_pacemaker.py | 4 ++-- doc/user/source/metrics/pacemaker.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_pacemaker.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_pacemaker.py index 83ef58d95..fdcbbc1ef 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_pacemaker.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_pacemaker.py @@ -99,7 +99,7 @@ class CrmMonitorPlugin(base.Base): # The metric needs to be emitted too for the Lua plugins executed # by the metric_collector service yield { - 'type_instance': 'resource_local_active', + 'type_instance': 'local_resource_active', 'values': same_hostname(node), 'meta': {'resource': self.notify_resource} } @@ -109,7 +109,7 @@ class CrmMonitorPlugin(base.Base): # The metric needs to be emitted for the alarms that leverage the other # metrics emitted by the plugin yield { - 'type_instance': 'dc_local_active', + 'type_instance': 'local_dc_active', 'values': same_hostname(current_dc), } diff --git a/doc/user/source/metrics/pacemaker.rst b/doc/user/source/metrics/pacemaker.rst index ed0ad5439..ee07ef341 100644 --- a/doc/user/source/metrics/pacemaker.rst +++ b/doc/user/source/metrics/pacemaker.rst @@ -3,7 +3,7 @@ Cluster ^^^^^^^ -* ``pacemaker_dc_local_active``, ``1`` when the Designated Controller (DC) is +* ``pacemaker_local_dc_active``, ``1`` when the Designated Controller (DC) is the local host, if not, then ``0``. * ``pacemaker_dc`` [#f1]_, ``1`` when the Designated Controller (DC) is @@ -34,7 +34,7 @@ one of 'offline', 'maintenance', or 'online': Resource ^^^^^^^^ -* ``pacemaker_resource_local_active``, ``1`` when the resource is located on +* ``pacemaker_local_resource_active``, ``1`` when the resource is located on the host reporting the metric, if not, then ``0``. The metric contains a ``resource`` field which is one of 'vip__public', 'vip__management', 'vip__vrouter_pub', or 'vip__vrouter'.