From 2eb26e6f9aa9aeea6b226e1705ab470aec1f2b9e Mon Sep 17 00:00:00 2001
From: Olivier Bourdon <obourdon@mirantis.com>
Date: Mon, 13 Feb 2017 08:47:42 +0100
Subject: [PATCH] Fix RabbitMQ EPMD trigger regexp for MOS 10.0

Change-Id: I04bf26da11eed0f5a285e6814641cd81bcbfa910
---
 .../files/import/Template_App_OpenStack_RabbitMQ_ha.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_OpenStack_RabbitMQ_ha.xml b/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_OpenStack_RabbitMQ_ha.xml
index eac4a1a..490bf81 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_OpenStack_RabbitMQ_ha.xml
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_OpenStack_RabbitMQ_ha.xml
@@ -106,7 +106,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,epmd -daemon]</key>
+                    <key>proc.num[,,,epmd -(daemon|systemd)]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -451,7 +451,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App OpenStack HA RabbitMQ:proc.num[,,,epmd -daemon].last(0)}=0</expression>
+            <expression>{Template App OpenStack HA RabbitMQ:proc.num[,,,epmd -(daemon|systemd)].last(0)}=0</expression>
             <name>RabbitMQ EPMD process is not running on {HOST.NAME}</name>
             <url/>
             <status>0</status>