From e434c34c4d82853a347b81d66c3d80120ee8dd0e Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Wed, 2 Aug 2017 17:35:12 +0100 Subject: [PATCH] removed jenkins check command from base commands, as that has been outsourced to the jenkins module --- README.md | 6 +++--- manifests/nagios/objects/add_servicegroup_rules.pp | 5 ----- manifests/nagios/objects/commands.pp | 11 ----------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index a7875a3..1f23ac8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.1.6 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.1.7 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| ### Synopsis Nagios is a powerful open source software solution for monitoring your IT environments. @@ -147,11 +147,11 @@ by Default, Nagios creates its own nagios.conf file, which is not a vhost file a In order to monitor clients, NAGIOS must be able to connect to them. There are multiple ways of doing so, the most common ones being NRPE and SSH. So far this module works through the usage of NRPE, which by default is enabled. Class cd_nagios::client::nrpe configures nrpe.cfg and opens the required firewall port on clients (optional,default). - -### Manage additional resources +### Manage Additional Resources ### Known Problems + ### Support * OS: CentOS 6, 7 * Puppet 3.x diff --git a/manifests/nagios/objects/add_servicegroup_rules.pp b/manifests/nagios/objects/add_servicegroup_rules.pp index 208286e..9dbe691 100644 --- a/manifests/nagios/objects/add_servicegroup_rules.pp +++ b/manifests/nagios/objects/add_servicegroup_rules.pp @@ -55,10 +55,5 @@ class cd_nagios::nagios::objects::add_servicegroup_rules ( content => template($ng_tgt_svcgrp_head_erb), order => '000', } - - cd_nagios::nagios::objects::add_servicegroups { 'example_servicegroup': - ng_servicegroup_name => 'example_servicegroup', - ng_servicegroup_alias => 'Example Servicegroup', - } } } diff --git a/manifests/nagios/objects/commands.pp b/manifests/nagios/objects/commands.pp index 33001f3..3a63552 100644 --- a/manifests/nagios/objects/commands.pp +++ b/manifests/nagios/objects/commands.pp @@ -207,17 +207,6 @@ class cd_nagios::nagios::objects::commands ( target => $ng_target_command, } - @@nagios_command { 'check_jenkins_api': - ensure => present, - command_name => 'check_jenkins_api', - command_line => '$USER1$/check_http -H $HOSTADDRESS$ -u /api/xml?depth=0 -R quietingDown.false $ARG1$ $ARG2$', - owner => 'nagios', - group => 'nagios', - mode => '0640', - target => $ng_target_command, - } - - @@nagios_command { 'process-service-perfdata-file': ensure => present, command_name => 'process-service-perfdata-file',