x
/
fuel-plugin-lma-infrastructure-alerting
Code Issues Proposed changes

Configure at least one dummy Nagios service check 

Nagios fails to start if no service check is configured, this is the
case when the plugin is deployed without LMA Collector plugin. To make
the CI happy, this patch configures a dummy service check.

Change-Id: Iebd95c5b2df073307a654cf423716b02629a9fc7
This commit is contained in:
Swann Croiset 2016-06-20 15:00:09 +02:00
parent bdaf9e607f
commit aaf626dbe6
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deployment_scripts/puppet/modules/lma_infra_alerting/manifests/nagios/hosts.pp
View File

@ -75,4 +75,21 @@ class lma_infra_alerting::nagios::hosts (
$node_cluster_alarms)
$afd_service_defaults = {'notifications_enabled' => 0}
create_resources(lma_infra_alerting::nagios::services, $afd_services, $afd_service_defaults)
if empty($node_cluster_roles) and empty($node_cluster_alarms) {
$node_uid= hiera('uid')
nagios::service { 'dummy-check-for-ci':
prefix => $lma_infra_alerting::params::nagios_config_filename_prefix,
onefile => false,
service_description => 'dummy-check',
dummy_cmd_state => 0,
dummy_cmd_state_string => 'OKAY',
dummy_cmd_text => 'dummy check okay',
properties => {
'host_name' => "node-${node_uid}",
'contact_groups' => $lma_infra_alerting::params::nagios_contactgroup,
'hostgroup_name' => 'primary-infrastructure_alerting'
}
}
}
}

16
deployment_scripts/puppet/modules/nagios/manifests/service.pp
View File

@ -30,10 +30,14 @@ define nagios::service (
$properties = {},
$defaults = {},
$ensure = present,
$dummy_cmd_state = 3,
$dummy_cmd_state_string = 'UNKNOWN',
$dummy_cmd_text = '',
){
validate_hash($properties, $defaults)
validate_string($properties['host_name'])
validate_integer($dummy_cmd_state)
$opts = {}
if is_array($properties['contact_groups']) {
@ -82,15 +86,21 @@ define nagios::service (
}
if $properties['check_command'] == undef {
# create a dummy command to report the UNKNOWN state when no data is received
$_check_command = "return-unknown-${title}"
# create a dummy command to report the $dummy_cmd_state state when no data is received
$dummy_string = downcase($dummy_cmd_state_string)
$_check_command = "return-${dummy_string}-${title}"
$opts['check_command'] = $_check_command
$final_properties = merge($properties, $opts)
$timeout_freshness = $final_properties['freshness_threshold'] * $final_properties['max_check_attempts']
if $dummy_cmd_text {
$dummy_text = $dummy_cmd_text
} else {
$dummy_text = "No data received for at least ${timeout_freshness} seconds"
}
nagios::command { $_check_command:
prefix => "${prefix}services_",
properties => {
command_line => "${nagios::params::nagios_plugin_dir}/check_dummy 3 'No data received for at least ${timeout_freshness} seconds'",
command_line => "${nagios::params::nagios_plugin_dir}/check_dummy ${dummy_cmd_state} '${dummy_text}'",
}
}
}