Browse Source

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

Change-Id: Id5c5129501d0dec41859b2e5f3eee97c24b6f90d
Closes-Bug: #1529643
Depends-On: I3868e46bc34238fc5848f60414f084c907b93437
Olivier Bourdon 3 years ago
parent
commit
dfa4116f06

+ 1
- 1
README.md View File

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

+ 6
- 0
deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/params.pp View File

@@ -29,4 +29,10 @@ class plugin_zabbix_snmptrapd::params {
29 29
     }
30 30
   }
31 31
 
32
+  $zabbix_base_conf_dir        = '/etc/zabbix'
33
+  $zabbix_extra_conf_subdir    = 'conf.d'
34
+  $zabbix_extra_conf_dir       = "${zabbix_base_conf_dir}/${zabbix_extra_conf_subdir}"
35
+  $server_snmp_config          = "${zabbix_extra_conf_dir}/zabbix_snmp.conf"
36
+  $server_snmp_config_template = 'plugin_zabbix_snmptrapd/zabbix_snmp.conf.erb'
37
+
32 38
 }

+ 6
- 11
deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/manifests/zabbix.pp View File

@@ -15,17 +15,12 @@
15 15
 #
16 16
 class plugin_zabbix_snmptrapd::zabbix {
17 17
 
18
-  file_line { 'enable SNMPTrapper in Zabbix':
19
-    path     => '/etc/zabbix/zabbix_server.conf',
20
-    match    => 'StartSNMPTrapper',
21
-    line     => 'StartSNMPTrapper=1',
22
-    notify   => Service['p_zabbix-server'],
23
-  }
24
-
25
-  file_line { 'set SNMPTrapperFile in Zabbix':
26
-    path     => '/etc/zabbix/zabbix_server.conf',
27
-    match    => 'SNMPTrapperFile',
28
-    line     => 'SNMPTrapperFile=/var/log/snmptt/snmptt.log',
18
+  file { $plugin_zabbix_snmptrapd::params::server_snmp_config:
19
+    ensure  => present,
20
+    owner   => 'root',
21
+    group   => 'root',
22
+    mode    => '0644',
23
+    content => template($plugin_zabbix_snmptrapd::params::server_snmp_config_template),
29 24
     notify   => Service['p_zabbix-server'],
30 25
   }
31 26
 

+ 10
- 0
deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/templates/zabbix_snmp.conf.erb View File

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

Loading…
Cancel
Save