From d987ba49162e09ce12a415326610fc06bf162a6b Mon Sep 17 00:00:00 2001
From: Dmitry Nikishov <dnikishov@mirantis.com>
Date: Mon, 4 Aug 2014 11:23:45 +0400
Subject: [PATCH] Removed duplicate Neutron API monitoring item

Removed Neutron API template that had a duplicate check which caused multiple warning messages during controller deployment if Neutron is enabled.

Change-Id: Id58636feabbd3942c496b8a670da50532607bb00
Closes-Bug: #1350323
---
 .../Template_App_OpenStack_Neutron_API.xml    | 83 -------------------
 .../manifests/monitoring/neutron_mon.pp       |  6 --
 .../puppet/zabbix/manifests/server/config.pp  |  5 --
 3 files changed, 94 deletions(-)
 delete mode 100644 deployment/puppet/zabbix/files/import/Template_App_OpenStack_Neutron_API.xml

diff --git a/deployment/puppet/zabbix/files/import/Template_App_OpenStack_Neutron_API.xml b/deployment/puppet/zabbix/files/import/Template_App_OpenStack_Neutron_API.xml
deleted file mode 100644
index 91e2467bd8..0000000000
--- a/deployment/puppet/zabbix/files/import/Template_App_OpenStack_Neutron_API.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<zabbix_export>
-    <version>2.0</version>
-    <date>2013-07-10T21:19:04Z</date>
-    <groups>
-        <group>
-            <name>Templates</name>
-        </group>
-    </groups>
-    <templates>
-        <template>
-            <template>Template App OpenStack Neutron API</template>
-            <name>Template App OpenStack Neutron API</name>
-            <groups>
-                <group>
-                    <name>Templates</name>
-                </group>
-            </groups>
-            <applications>
-                <application>
-                    <name>Neutron API</name>
-                </application>
-            </applications>
-            <items>
-                <item>
-                    <name>Neutron API Server is listening on port</name>
-                    <type>3</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>net.tcp.service[http,{$IP_MANAGEMENT},9696]</key>
-                    <delay>60</delay>
-                    <history>90</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <delta>0</delta>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privpassphrase/>
-                    <formula>1</formula>
-                    <delay_flex/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <data_type>0</data_type>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>Neutron API</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                </item>
-            </items>
-            <discovery_rules/>
-            <macros/>
-            <templates/>
-            <screens/>
-        </template>
-    </templates>
-    <triggers>
-        <trigger>
-            <expression>{Template App OpenStack Neutron API:net.tcp.service[http,{$IP_MANAGEMENT},9696].last(0)}=0</expression>
-            <name>Neutron API service is down on {HOST.NAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>4</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-    </triggers>
-</zabbix_export>
diff --git a/deployment/puppet/zabbix/manifests/monitoring/neutron_mon.pp b/deployment/puppet/zabbix/manifests/monitoring/neutron_mon.pp
index a8e76b2a78..7b763d313c 100644
--- a/deployment/puppet/zabbix/manifests/monitoring/neutron_mon.pp
+++ b/deployment/puppet/zabbix/manifests/monitoring/neutron_mon.pp
@@ -11,12 +11,6 @@ class zabbix::monitoring::neutron_mon {
       api => $zabbix::params::api_hash,
     }
 
-    zabbix_template_link { "$zabbix::params::host_name Template App OpenStack Neutron API":
-      host => $zabbix::params::host_name,
-      template => 'Template App OpenStack Neutron API',
-      api => $zabbix::params::api_hash,
-    }
-
     zabbix_template_link { "$zabbix::params::host_name Template App OpenStack Neutron API check":
       host    => $zabbix::params::host_name,
       template => 'Template App OpenStack Neutron API check',
diff --git a/deployment/puppet/zabbix/manifests/server/config.pp b/deployment/puppet/zabbix/manifests/server/config.pp
index 6bb50e6015..8bb76c1401 100644
--- a/deployment/puppet/zabbix/manifests/server/config.pp
+++ b/deployment/puppet/zabbix/manifests/server/config.pp
@@ -246,11 +246,6 @@ class zabbix::server::config {
     xml_file => '/etc/zabbix/import/Template_App_OpenStack_Neutron_DHCP_Agent.xml',
     api => $zabbix::params::api_hash,
   }
-  zabbix_configuration_import { 'Template_App_OpenStack_Neutron_API.xml Import':
-    ensure   => present,
-    xml_file => '/etc/zabbix/import/Template_App_OpenStack_Neutron_API.xml',
-    api => $zabbix::params::api_hash,
-  }
   zabbix_configuration_import { 'Template_App_OpenStack_Neutron_API_check.xml Import':
     ensure   => present,
     xml_file => '/etc/zabbix/import/Template_App_OpenStack_Neutron_API_check.xml',