confdroid/confdroid_nagios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

OP#436 add full service details

Browse Source
This commit is contained in:
Arne Teuke
2026-03-01 18:40:19 +01:00
parent 33e27b57c5
commit 98deadc906
13 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/client/target.pp
View File

@@ -12,7 +12,7 @@ class confdroid_nagios::client::target (
@@nagios_host { $fqdn: @@nagios_host { $fqdn:
ensure => $ng_ping_ensure, ensure => $ng_ping_ensure,
alias => $fqdn, alias => $hostname,
address => $fqdn, address => $fqdn,
use => 'linux-server', use => 'linux-server',
target => $ng_target_host, target => $ng_target_host,
@@ -24,7 +24,7 @@ class confdroid_nagios::client::target (
group => 'nagios', group => 'nagios',
mode => '0640', mode => '0640',
check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
notify => Service[$ng_nagios_service], notify => Service[$ng_service],
} }
@@nagios_service { "root_partition_${fqdn}": @@nagios_service { "root_partition_${fqdn}":

2
manifests/nagios/objects/add_contact_rules.pp
View File

@@ -26,7 +26,7 @@ class confdroid_nagios::nagios::objects::add_contact_rules (
selrole => object_r, selrole => object_r,
seltype => nagios_etc_t, seltype => nagios_etc_t,
seluser => system_u, seluser => system_u,
notify => Service[$ng_nagios_service], notify => Service[$ng_service],
} }
# manage file header # manage file header

2
manifests/nagios/objects/add_contactgroups_rules.pp
View File

@@ -26,7 +26,7 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules (
selrole => object_r, selrole => object_r,
seltype => nagios_etc_t, seltype => nagios_etc_t,
seluser => system_u, seluser => system_u,
notify => Service[$ng_nagios_service], notify => Service[$ng_service],
} }
# manage file header # manage file header

2
manifests/nagios/objects/add_hostgroup_rules.pp
View File

@@ -25,7 +25,7 @@ class confdroid_nagios::nagios::objects::add_hostgroup_rules (
selrole => object_r, selrole => object_r,
seltype => nagios_etc_t, seltype => nagios_etc_t,
seluser => system_u, seluser => system_u,
notify => Service[$ng_nagios_service], notify => Service[$ng_service],
} }
# manage file header # manage file header

2
manifests/nagios/objects/add_servicegroup_rules.pp
View File

@@ -25,7 +25,7 @@ class confdroid_nagios::nagios::objects::add_servicegroup_rules (
selrole => object_r, selrole => object_r,
seltype => nagios_etc_t, seltype => nagios_etc_t,
seluser => system_u, seluser => system_u,
notify => Service[$ng_nagios_service], notify => Service[$ng_service],
} }
# manage file header # manage file header

2
manifests/nagios/resources/resource.pp
View File

@@ -21,7 +21,7 @@ class confdroid_nagios::nagios::resources::resource (
selrole => object_r, selrole => object_r,
seltype => nagios_etc_t, seltype => nagios_etc_t,
seluser => system_u, seluser => system_u,
notify => Service[$ng_nagios_service], notify => Service[$ng_service],
} }
concat::fragment { 'header': concat::fragment { 'header':

4
manifests/params.pp
View File

@@ -183,7 +183,7 @@ class confdroid_nagios::params (
$os_release = $facts['os']['release']['major'] $os_release = $facts['os']['release']['major']
# service # service
$ng_nagios_service = 'nagios' $ng_service = 'nagios'
# directories # directories
$ng_main_dir = '/etc/nagios' $ng_main_dir = '/etc/nagios'
@@ -238,7 +238,7 @@ class confdroid_nagios::params (
$ng_cntctgrps_head_erb = 'confdroid_nagios/nagios/contactgroups_cfg_head.erb' $ng_cntctgrps_head_erb = 'confdroid_nagios/nagios/contactgroups_cfg_head.erb'
$ng_cntctgrps_rule_erb = 'confdroid_nagios/nagios/contactgroups_cfg_rule.erb' $ng_cntctgrps_rule_erb = 'confdroid_nagios/nagios/contactgroups_cfg_rule.erb'
$ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" $ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg"
$ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios' $ng_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios'
$ng_htpasswd_file = "${ng_main_dir}/passwd" $ng_htpasswd_file = "${ng_main_dir}/passwd"
$ng_htpasswd_head = 'confdroid_nagios/nagios/htpasswd_head.erb' $ng_htpasswd_head = 'confdroid_nagios/nagios/htpasswd_head.erb'
$ng_htpasswd_rule = 'confdroid_nagios/nagios/htpasswd_rule.erb' $ng_htpasswd_rule = 'confdroid_nagios/nagios/htpasswd_rule.erb'

2
manifests/server/access.pp
View File

@@ -17,7 +17,7 @@ define confdroid_nagios::server::access (
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_htpasswd_file = $confdroid_nagios::params::ng_htpasswd_file $ng_htpasswd_file = $confdroid_nagios::params::ng_htpasswd_file
$ng_htpasswd_rule = $confdroid_nagios::params::ng_htpasswd_rule $ng_htpasswd_rule = $confdroid_nagios::params::ng_htpasswd_rule
$ng_nagios_service = $confdroid_nagios::params::ng_nagios_service $ng_service = $confdroid_nagios::params::ng_service
if $fqdn == $ng_nagios_server { if $fqdn == $ng_nagios_server {
# create password rules # create password rules

18
manifests/server/files.pp
View File

@@ -14,21 +14,7 @@ class confdroid_nagios::server::files (
group => 'nagios', group => 'nagios',
mode => '0644', mode => '0644',
content => template($ng_nagios_cfg_erb), content => template($ng_nagios_cfg_erb),
notify => Service[$ng_nagios_service], notify => Service[$ng_service],
} }
# custom cfg files
## temp place holder, this will be done via defines
## and PuppetDB exports and imports in the future
#file { $ng_target_command:
# ensure => file,
# owner => 'nagios',
# group => 'nagios',
# mode => '0644',
# selrange => s0,
# selrole => object_r,
# seltype => nagios_etc_t,
# seluser => system_u,
# notify => Service[$ng_nagios_service],
#}
} }
} }

8
manifests/server/service.pp
View File

@@ -17,9 +17,9 @@ class confdroid_nagios::server::service (
refreshonly => true, refreshonly => true,
} }
service { $ng_nagios_service: service { $ng_service:
ensure => running, ensure => running,
name => $ng_nagios_service, name => $ng_service,
enable => true, enable => true,
hasrestart => true, hasrestart => true,
hasstatus => true, hasstatus => true,
@@ -44,7 +44,7 @@ class confdroid_nagios::server::service (
} }
@@nagios_service { 'check_nagios_localhost': @@nagios_service { 'check_nagios_localhost':
check_command => $ng_nagios_service_cmd, check_command => $ng_service_cmd,
use => 'generic-service', use => 'generic-service',
host_name => 'localhost', host_name => 'localhost',
notification_period => '24x7', notification_period => '24x7',
@@ -197,7 +197,5 @@ class confdroid_nagios::server::service (
Nagios_contactgroup <<||>> { notify => Service['nagios'] } Nagios_contactgroup <<||>> { notify => Service['nagios'] }
Nagios_command <<||>> { notify => Service['nagios'] } Nagios_command <<||>> { notify => Service['nagios'] }
Nagios_timeperiod <<||>> { notify => Service['nagios'] } Nagios_timeperiod <<||>> { notify => Service['nagios'] }
} }
} }

2
templates/nagios/cgi_cfg.erb
View File

@@ -22,7 +22,7 @@ default_user_name=<%= @ng_def_user_name %>
authorized_for_system_information=<%= @ng_contact_name %>,<%= @ng_sysinfo_auth %> authorized_for_system_information=<%= @ng_contact_name %>,<%= @ng_sysinfo_auth %>
authorized_for_configuration_information=<%= @ng_contact_name %>,<%= @ng_confinfo_auth %> authorized_for_configuration_information=<%= @ng_contact_name %>,<%= @ng_confinfo_auth %>
authorized_for_system_commands=<%= @ng_contact_name %>,<%= @ng_command_auth %> authorized_for_system_commands=<%= @ng_contact_name %>,<%= @ng_command_auth %>
authorized_for_all_services=<%= @ng_contact_name %>,<%= @ng_nagios_serviceview_auth %> authorized_for_all_services=<%= @ng_contact_name %>,<%= @ng_serviceview_auth %>
authorized_for_all_hosts=<%= @ng_contact_name %>,<%= @ng_hostview_auth %> authorized_for_all_hosts=<%= @ng_contact_name %>,<%= @ng_hostview_auth %>
authorized_for_all_service_commands=<%= @ng_contact_name %>,<%= @ng_svc_cmd_auth %> authorized_for_all_service_commands=<%= @ng_contact_name %>,<%= @ng_svc_cmd_auth %>
authorized_for_all_host_commands=<%= @ng_contact_name %>,<%= @ng_host_cmd_auth %> authorized_for_all_host_commands=<%= @ng_contact_name %>,<%= @ng_host_cmd_auth %>

6
templates/nagios/svcgroups_cfg_rule.erb
View File

@@ -1,6 +1,6 @@
define servicegroup { define servicegroup {
servicegroup_name <%= @ng_nagios_servicegroup_name %> servicegroup_name <%= @ng_servicegroup_name %>
alias <%= @ng_nagios_servicegroup_alias %> alias <%= @ng_servicegroup_alias %>
register <%= @ng_nagios_servicegroup_register %> register <%= @ng_servicegroup_register %>
} }

6
templates/nagios/templates_cfg_rule.erb
View File

@@ -4,9 +4,9 @@ define <%= @ng_template_object %>{
name <%= @ng_template_object_name %> name <%= @ng_template_object_name %>
service_notification_period <%= @ng_svc_notification_period %> service_notification_period <%= @ng_svc_notification_period %>
host_notification_period <%= @ng_host_notification_period %> host_notification_period <%= @ng_host_notification_period %>
service_notification_options <%= @ng_nagios_service_notification_options %> service_notification_options <%= @ng_service_notification_options %>
host_notification_options <%= @ng_host_notification_options %> host_notification_options <%= @ng_host_notification_options %>
service_notification_commands <%= @ng_nagios_service_notification_commands %> service_notification_commands <%= @ng_service_notification_commands %>
host_notification_commands <%= @ng_host_notification_commands %> host_notification_commands <%= @ng_host_notification_commands %>
register <%= @ng_object_register %> register <%= @ng_object_register %>
} }
@@ -114,7 +114,7 @@ define <%= @ng_template_object %>{
check_interval <%= @ng_check_interval %> check_interval <%= @ng_check_interval %>
retry_interval <%= @ng_retry_interval %> retry_interval <%= @ng_retry_interval %>
contact_groups <%= @ng_contact_groups %> contact_groups <%= @ng_contact_groups %>
notification_options <%= @ng_nagios_service_notification_options %> notification_options <%= @ng_service_notification_options %>
notification_interval <%= @ng_notification_interval %> notification_interval <%= @ng_notification_interval %>
notification_period <%= @ng_notification_period %> notification_period <%= @ng_notification_period %>
register <%= @ng_object_register %> register <%= @ng_object_register %>