x
/
fuel-plugin-external-zabbix
Code Issues Proposed changes

Accept incoming connections from mgmt vip for zabbix agent 

Related-bug: #1510115

Change-Id: I4a1ff1c47e4c3053ff5fde19f00d539eb1f6f9c3
This commit is contained in:
Swann Croiset 2015-11-24 16:45:33 +01:00
parent a2ab0bc0a6
commit 06b9e4f561
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
View File

@ -91,6 +91,7 @@ class plugin_zabbix::params {
#server parameters
$vip_name = 'zbx_vip_mgmt'
$server_ip = $network_metadata['vips'][$vip_name]['ipaddr']
$mgmt_vip = $network_metadata['vips']['management']['ipaddr']
$server_config = '/etc/zabbix/zabbix_server.conf'
$server_config_template = 'plugin_zabbix/zabbix_server.conf.erb'
$server_node_id = 0

2
deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_agentd.conf.erb
View File

@ -2,7 +2,7 @@
# Fake server declaration to enforce running agent without
# separate server declaration in /etc/zabbix/zabbix_agent.d/server.conf
Server=<%= scope.lookupvar('plugin_zabbix::params::server_ip') %>,<%= scope.lookupvar('plugin_zabbix::monitoring::server_ips').join(',') %>
Server=<%= scope.lookupvar('plugin_zabbix::params::server_ip') %>,<%= scope.lookupvar('plugin_zabbix::monitoring::server_ips').join(',') %>,<%= scope.lookupvar('plugin_zabbix::params::mgmt_vip') %>
ServerActive=<%= scope.lookupvar('plugin_zabbix::params::server_ip') %>
Hostname=<%= @fqdn %>