Zabbix snmptrapd: Service "snmptt" was restarted after executing of task "upload_core_repos"

Change-Id: Id5c5129501d0dec41859b2e5f3eee97c24b6f90d
Closes-Bug: #1529643
Depends-On: I3868e46bc34238fc5848f60414f084c907b93437
This commit is contained in:
Olivier Bourdon 2016-01-15 17:04:31 +01:00
parent b996d01a39
commit dfa4116f06
4 changed files with 23 additions and 12 deletions

View File

@ -16,7 +16,7 @@ Requirements
| Requirement | Version/Comment |
|:---------------------------------|:----------------|
| Mirantis OpenStack compatibility | 7.0 |
| Zabbix plugin for Fuel | 2.0.0 |
| Zabbix plugin for Fuel | 2.5.0 |
Installation Guide
==================

View File

@ -29,4 +29,10 @@ class plugin_zabbix_snmptrapd::params {
}
}
$zabbix_base_conf_dir = '/etc/zabbix'
$zabbix_extra_conf_subdir = 'conf.d'
$zabbix_extra_conf_dir = "${zabbix_base_conf_dir}/${zabbix_extra_conf_subdir}"
$server_snmp_config = "${zabbix_extra_conf_dir}/zabbix_snmp.conf"
$server_snmp_config_template = 'plugin_zabbix_snmptrapd/zabbix_snmp.conf.erb'
}

View File

@ -15,17 +15,12 @@
#
class plugin_zabbix_snmptrapd::zabbix {
file_line { 'enable SNMPTrapper in Zabbix':
path => '/etc/zabbix/zabbix_server.conf',
match => 'StartSNMPTrapper',
line => 'StartSNMPTrapper=1',
notify => Service['p_zabbix-server'],
}
file_line { 'set SNMPTrapperFile in Zabbix':
path => '/etc/zabbix/zabbix_server.conf',
match => 'SNMPTrapperFile',
line => 'SNMPTrapperFile=/var/log/snmptt/snmptt.log',
file { $plugin_zabbix_snmptrapd::params::server_snmp_config:
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
content => template($plugin_zabbix_snmptrapd::params::server_snmp_config_template),
notify => Service['p_zabbix-server'],
}

View File

@ -0,0 +1,10 @@
### Managed by Puppet ###
# This is SNMP config file for ZABBIX server process
# To get more information about ZABBIX,
# go http://www.zabbix.com
############ GENERAL PARAMETERS #################
#SNMP Trapper
StartSNMPTrapper=1
SNMPTrapperFile=/var/log/snmptt/snmptt.log