Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

ok this should fix noc02

Browse source
This commit is contained in:
Stephen Smoogen 2017-05-01 18:11:02 +00:00
parent 7ae0b3abba
commit e51982268b
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/noc.yml
View file

@ -38,7 +38,7 @@
- include: "{{ handlers_path }}/restart_services.yml" - include: "{{ handlers_path }}/restart_services.yml"
- name: deploy service-specific config (just for production) - name: deploy service-specific config (just for production)
hosts: nagios-new hosts: nagios
user: root user: root
gather_facts: True gather_facts: True

2
roles/nagios_server/files/nrpe/nrpe.cfg
View file

@ -32,7 +32,7 @@ debug=0
# number. The file is only written if the NRPE daemon is started by the root # number. The file is only written if the NRPE daemon is started by the root
# user and is running in standalone mode. # user and is running in standalone mode.
pid_file=/var/run/nrpe/nrpe.pid #pid_file=/var/run/nrpe.pid

5
roles/nagios_server/templates/nagios/hosts/phx2-hosts.cfg.j2
View file

@ -85,7 +85,6 @@ define host {
define host { define host {
host_name virthost20.phx2.fedoraproject.org host_name virthost20.phx2.fedoraproject.org
alias virthost20.phx2.fedoraproject.org alias virthost20.phx2.fedoraproject.org
use mincheck
check_command check-host-alive check_command check-host-alive
address 10.5.126.160 address 10.5.126.160
parents phx2-gw parents phx2-gw
@ -96,7 +95,11 @@ define host {
{% for host in groups['all'] %} {% for host in groups['all'] %}
{% if hostvars[host].datacenter == 'phx2' %} {% if hostvars[host].datacenter == 'phx2' %}
define host { define host {
{% if hostvars[host].nagios_services['nrpe'] == true %}
use defaulttemplate use defaulttemplate
{% else %}
use mincheck
{% endif %}
host_name {{ host }} host_name {{ host }}
{% if hostvars[host].ansible_hostname is defined %} {% if hostvars[host].ansible_hostname is defined %}
alias {{ hostvars[host].ansible_hostname }} alias {{ hostvars[host].ansible_hostname }}