From 3127767eb898511a0986e6989f3ccdbd116d0a32 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 30 Sep 2013 13:17:07 +0200 Subject: [PATCH] Remove obsolete ITL templates. --- itl/Makefile.am | 3 -- itl/command-common.conf | 7 +++ itl/host.conf | 32 -------------- itl/itl.conf | 3 -- itl/service-common.conf | 96 ----------------------------------------- itl/service.conf | 26 ----------- 6 files changed, 7 insertions(+), 160 deletions(-) delete mode 100644 itl/host.conf delete mode 100644 itl/service-common.conf delete mode 100644 itl/service.conf diff --git a/itl/Makefile.am b/itl/Makefile.am index 978f8aa99..7a57bc013 100644 --- a/itl/Makefile.am +++ b/itl/Makefile.am @@ -4,10 +4,7 @@ icinga2itl_DATA = \ command-common.conf \ constants.conf \ itl.conf \ - host.conf \ timeperiod.conf \ - service.conf \ - service-common.conf \ standalone.conf EXTRA_DIST = $(icinga2itl_DATA) diff --git a/itl/command-common.conf b/itl/command-common.conf index 56094cb80..385a89666 100644 --- a/itl/command-common.conf +++ b/itl/command-common.conf @@ -222,3 +222,10 @@ object CheckCommand "snmp" inherits "plugin-check-command" { community = "public" } } + +object CheckCommand "snmp-uptime" inherits "snmp" { + macros += { + oid = "1.3.6.1.2.1.1.3.0" + } +} + diff --git a/itl/host.conf b/itl/host.conf deleted file mode 100644 index e14577d88..000000000 --- a/itl/host.conf +++ /dev/null @@ -1,32 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/) * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation * - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ******************************************************************************/ - -object HostGroup "all-hosts" { - display_name = "All Hosts" -} - -template Host "itl-host" { - groups = [ "all-hosts" ], - - services["ping4"] = { - templates = [ "ping4" ] - }, - - check = "ping4" -} diff --git a/itl/itl.conf b/itl/itl.conf index e0cd48252..6700e10ad 100644 --- a/itl/itl.conf +++ b/itl/itl.conf @@ -23,9 +23,6 @@ */ include "constants.conf" -include "host.conf" include "command.conf" include "command-common.conf" -include "service.conf" -include "service-common.conf" include "timeperiod.conf" diff --git a/itl/service-common.conf b/itl/service-common.conf deleted file mode 100644 index 19d08529a..000000000 --- a/itl/service-common.conf +++ /dev/null @@ -1,96 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/) * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation * - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ******************************************************************************/ - -template Service "ping4" { - check_command = "ping4" -} - -template Service "ping6" { - check_command = "ping6" -} - -template Service "dummy" { - check_command = "dummy" -} - -template Service "tcp" { - check_command = "tcp" -} - -template Service "udp" { - check_command = "udp" -} - -template Service "http_vhost" { - check_command = "http_vhost" -} - -template Service "http_ip" { - check_command = "http_ip" -} - -template Service "https_vhost" { - check_command = "https_vhost" -} - -template Service "https_ip" { - check_command = "https_ip" -} - -template Service "smtp" { - check_command = "smtp" -} - -template Service "ssmtp" { - check_command = "ssmtp" -} - -template Service "ntp_time" { - check_command = "ntp_time" -} - -template Service "ssh" { - check_command = "ssh" -} - -template Service "disk" { - check_command = "disk" -} - -template Service "users" { - check_command = "users" -} - -template Service "processes" { - check_command = "processes" -} - -template Service "load" { - check_command = "load" -} - -template Service "snmp" { - check_command = "snmp" -} - -template Service "snmp-uptime" inherits "snmp" { - macros += { - oid = "1.3.6.1.2.1.1.3.0" - } -} diff --git a/itl/service.conf b/itl/service.conf deleted file mode 100644 index 934f00c92..000000000 --- a/itl/service.conf +++ /dev/null @@ -1,26 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/) * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation * - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ******************************************************************************/ - -object ServiceGroup "all-services" { - display_name = "All Services" -} - -template Service "itl-service" { - groups = [ "all-services" ] -}