From b88753cc14915dab232f88677aff3b67805e6394 Mon Sep 17 00:00:00 2001
From: root <syrinx@FreeBSD.org>
Date: Tue, 29 Oct 2019 11:14:53 +0200
Subject: [PATCH] More user-friendly names for the SNMP checks

---
 monitoring/icinga2/conf.d/commands-new.conf | 2 +-
 monitoring/icinga2/conf.d/services-new.conf | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/monitoring/icinga2/conf.d/commands-new.conf b/monitoring/icinga2/conf.d/commands-new.conf
index cc24662..847f2dc 100644
--- a/monitoring/icinga2/conf.d/commands-new.conf
+++ b/monitoring/icinga2/conf.d/commands-new.conf
@@ -43,7 +43,7 @@ object CheckCommand "check_bandwidth" {
 #######################################################################################
 object CheckCommand "check_operstatus" {
 	import "plugin-check-command"
-	command = PluginDir + "/check_snmp -H $host$ -C openfest --oid $OID$ -s $value$"
+	command = PluginDir + "/check_snmp -H $host$ -C openfest --oid $OID$ --miblist=IF-MIB -r $value$"
 	vars.host=""
 	vars.OID=""
 	vars.value=""
diff --git a/monitoring/icinga2/conf.d/services-new.conf b/monitoring/icinga2/conf.d/services-new.conf
index 84f23fc..939e858 100644
--- a/monitoring/icinga2/conf.d/services-new.conf
+++ b/monitoring/icinga2/conf.d/services-new.conf
@@ -28,7 +28,7 @@ apply Service "network_open_ports" {
 
 apply Service for (iface => config in host.vars.ifaces) {
 	import "generic-service"
-	display_name = "check_bandwidth"
+	display_name = "bandwidth_" + iface
 
 	check_command = "check_bandwidth"
 
@@ -39,7 +39,7 @@ apply Service for (iface => config in host.vars.ifaces) {
 
 apply Service for (iface => config in host.vars.snmp_ifaces) {
 	import "generic-service"
-	display_name = "check_operstatus"
+	display_name = "operstatus_" + iface
 
 	check_command = "check_operstatus"