diff --git a/roles/monitoring_engine/defaults/main.yml b/roles/monitoring_engine/defaults/main.yml index c50d5b268a1619b6a42d2b72ad4694d55a937b28..7942e977fad92238cb406dd6c9d931543d2f04b8 100644 --- a/roles/monitoring_engine/defaults/main.yml +++ b/roles/monitoring_engine/defaults/main.yml @@ -15,7 +15,7 @@ nagios_role: PROJECT include_empty_hosts: "0" enable_notifications: "0" check_hosts: "0" -tenant: TENANT_A +tenant_name: TENANT_A poem_root_url: http://localhost/poem include_proxy_checks: "0" include_msg_checks_recv: "0" @@ -23,3 +23,16 @@ ocsp_command: handle_service_check obsess_over_services: "1" enable_environment_macros: "1" backup_instance: "false" +cfg_dir: /etc/nagios/argo-ncg.d +use_syslog: "0" +log_initial_states: "1" +log_external_commands: "0" +log_passive_checks: "0" +service_check_timeout: 910 +process_performance_data: "1" +host_perfdata_file_template: "DATATYPE::HOSTPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tHOSTPERFDATA::$HOSTPERFDATA$\tHOSTCHECKCOMMAND::$HOSTCHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$" +service_perfdata_file_template: "DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$" +host_perfdata_file_processing_command: ncg-process-host-perfdata-file +service_perfdata_file_processing_command: ncg-process-service-perfdata-file +use_large_installation_tweaks: "1" +allow_empty_hostgroup_assignment: "1" \ No newline at end of file diff --git a/roles/monitoring_engine/templates/nagios.cfg.j2 b/roles/monitoring_engine/templates/nagios.cfg.j2 index a0303957af8656b22978304732d0ae278ff43895..a15063dda4222819c0e1acef4304c824bd756fe3 100644 --- a/roles/monitoring_engine/templates/nagios.cfg.j2 +++ b/roles/monitoring_engine/templates/nagios.cfg.j2 @@ -49,11 +49,11 @@ log_file=/var/log/nagios/nagios.log # directive as shown below: #cfg_dir=/etc/nagios/conf.d -cfg_dir=/etc/nagios/wlcg.d #cfg_dir=/etc/nagios/printers #cfg_dir=/etc/nagios/switches #cfg_dir=/etc/nagios/routers +cfg_dir={{ cfg_dir }} @@ -251,7 +251,7 @@ log_archive_path=/var/log/nagios/archives # If you want messages logged to the syslog facility, as well as the # Nagios log file set this option to 1. If not, set it to 0. -use_syslog=1 +use_syslog={{ use_syslog }} @@ -296,7 +296,7 @@ log_event_handlers=1 # statistics reporting, you do not need to enable this option. In # this case, set the value to 0. -log_initial_states=0 +log_initial_states={{ log_initial_states }} @@ -316,7 +316,7 @@ log_current_states=1 # checks - see the option below for controlling whether or not # passive checks are logged. -log_external_commands=1 +log_external_commands={{ log_external_commands }} @@ -325,7 +325,7 @@ log_external_commands=1 # this value to 0. If passive checks should be logged, set # this value to 1. -log_passive_checks=1 +log_passive_checks={{ log_passive_checks }} @@ -586,7 +586,7 @@ auto_rescheduling_window=180 # ocsp command, and performance data commands. All values are in # seconds. -service_check_timeout=60 +service_check_timeout={{ service_check_timeout }} host_check_timeout=30 event_handler_timeout=30 notification_timeout=30 @@ -808,7 +808,7 @@ enable_event_handlers=1 # performance data. # Values: 1 = process performance data, 0 = do not process performance data -process_performance_data=0 +process_performance_data={{ process_performance_data }} @@ -846,6 +846,8 @@ process_performance_data=0 #host_perfdata_file_template=[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$ #service_perfdata_file_template=[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$ +host_perfdata_file_template={{ host_perfdata_file_template }} +service_perfdata_file_template={{ service_perfdata_file_template }} # HOST AND SERVICE PERFORMANCE DATA FILE MODES @@ -879,6 +881,8 @@ process_performance_data=0 #host_perfdata_file_processing_command=process-host-perfdata-file #service_perfdata_file_processing_command=process-service-perfdata-file +host_perfdata_file_processing_command={{ host_perfdata_file_processing_command }} +service_perfdata_file_processing_command={{ service_perfdata_file_processing_command }} # HOST AND SERVICE PERFORMANCE DATA PROCESS EMPTY RESULTS @@ -901,7 +905,7 @@ process_performance_data=0 # implementing distributed monitoring. # Values: 1 = obsess over services, 0 = do not obsess (default) -obsess_over_services= {{ obsess_over_services }} +obsess_over_services={{ obsess_over_services }} @@ -1121,7 +1125,7 @@ date_format=us # be used in host names, service descriptions, or names of other # object types. -illegal_object_name_chars=`~!$%^&*|'"<>?,()= +illegal_object_name_chars=`~!$%^*|"<>?, @@ -1140,7 +1144,7 @@ illegal_object_name_chars=`~!$%^&*|'"<>?,()= # $SERVICEACKAUTHOR$ # $SERVICEACKCOMMENT$ -illegal_macro_output_chars=`~$&|'"<> +illegal_macro_output_chars=`~$|'"<> @@ -1201,7 +1205,7 @@ daemon_dumps_core=0 # Values: 1 - Enabled tweaks # 0 - Disable tweaks (default) -use_large_installation_tweaks=0 +use_large_installation_tweaks={{ use_large_installation_tweaks }} @@ -1304,7 +1308,7 @@ max_debug_file_size=1000000 # Should we allow hostgroups to have no hosts, we default this to off since # that was the old behavior -allow_empty_hostgroup_assignment=0 +allow_empty_hostgroup_assignment={{ allow_empty_hostgroup_assignment }} diff --git a/roles/repos/tasks/main.yml b/roles/repos/tasks/main.yml index 810764902a6b833ca6b9f3964b0f9a1d49b9f570..8eabeacf3e2fb2f7a8b02350c80c63e7ab3814db 100644 --- a/roles/repos/tasks/main.yml +++ b/roles/repos/tasks/main.yml @@ -38,4 +38,9 @@ copy: src=etc/yum.repos.d/nagios.repo dest=/etc/yum.repos.d/nagios.repo backup=no owner=root group=root mode=0644 - when: inventory_hostname in groups.monitoring_engine \ No newline at end of file + when: inventory_hostname in groups.monitoring_engine + +- name: Install UMD repo + tags: umd_repo + shell: yum install http://repository.egi.eu/sw/production/umd/3/sl6/x86_64/updates/umd-release-3.0.1-1.el6.noarch.rpm + when: inventory_hostname in groups.monitoring_engine and nagios_plugins_umd is defined