diff --git a/README.md b/README.md index 74bafbd..54e9c1a 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ - manage required files and directories including selinux context - manage service - (optional) manage firewall +- (optional) manage nagios monitoring for `sshd` ## Adding custom configurations diff --git a/doc/file.README.html b/doc/file.README.html index 407b1fc..597bf3f 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -104,6 +104,8 @@

manage service

  • (optional) manage firewall

    +
  • +

    (optional) manage nagios monitoring for sshd

  • Adding custom configurations

    diff --git a/doc/index.html b/doc/index.html index 60a203a..e8176d9 100644 --- a/doc/index.html +++ b/doc/index.html @@ -104,6 +104,8 @@

    manage service

  • (optional) manage firewall

    +
  • +

    (optional) manage nagios monitoring for sshd

  • Adding custom configurations

    diff --git a/doc/puppet_classes/confdroid_ssh_3A_3Amonitoring_3A_3Atarget.html b/doc/puppet_classes/confdroid_ssh_3A_3Amonitoring_3A_3Atarget.html index 927012b..34f5b3f 100644 --- a/doc/puppet_classes/confdroid_ssh_3A_3Amonitoring_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_ssh_3A_3Amonitoring_3A_3Atarget.html @@ -125,12 +125,12 @@ class confdroid_ssh::monitoring::target ( ) inherits confdroid_ssh::params { if $ssh_manage_nagios == true { - @@nagios_service { "check_ssh_${fqdn}": - check_command => "check_nrpe!check_ssh!${ssh_procs_allowed}!sshd", + @@nagios_service { "check_sshd_${fqdn}": + check_command => "check_nrpe!check_sshd!${ssh_procs_allowed}!sshd", use => 'generic-service', host_name => $fqdn, notification_period => '24x7', - service_description => "${fqdn}_check_ssh", + service_description => "${fqdn}_check_sshd", target => $ssh_target_service, owner => 'nagios', group => 'nagios', diff --git a/manifests/monitoring/target.pp b/manifests/monitoring/target.pp index b796ba0..84a2c3a 100644 --- a/manifests/monitoring/target.pp +++ b/manifests/monitoring/target.pp @@ -6,12 +6,12 @@ class confdroid_ssh::monitoring::target ( ) inherits confdroid_ssh::params { if $ssh_manage_nagios == true { - @@nagios_service { "check_ssh_${fqdn}": - check_command => "check_nrpe!check_ssh!${ssh_procs_allowed}!sshd", + @@nagios_service { "check_sshd_${fqdn}": + check_command => "check_nrpe!check_sshd!${ssh_procs_allowed}!sshd", use => 'generic-service', host_name => $fqdn, notification_period => '24x7', - service_description => "${fqdn}_check_ssh", + service_description => "${fqdn}_check_sshd", target => $ssh_target_service, owner => 'nagios', group => 'nagios',