openstack/fuel-library
Code Issues Proposed changes

Removed duplicate Neutron API monitoring item

Browse Source 
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
This commit is contained in:
Dmitry Nikishov 2014-08-04 11:23:45 +04:00
parent 4e3fdd75f8
commit d987ba4916
3 changed files with 0 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
deployment/puppet/zabbix/files/import/Template_App_OpenStack_Neutron_API.xml
View File

@ -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>

6
deployment/puppet/zabbix/manifests/monitoring/neutron_mon.pp
View File

@ -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',

5
deployment/puppet/zabbix/manifests/server/config.pp
View File

@ -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',