diff --git a/monitoring/icinga2/conf.d/commands-new.conf b/monitoring/icinga2/conf.d/commands-new.conf
index 9432f12..ceef132 100644
--- a/monitoring/icinga2/conf.d/commands-new.conf
+++ b/monitoring/icinga2/conf.d/commands-new.conf
@@ -93,3 +93,15 @@ object CheckCommand "bgp_sessions_check" {
 	vars.ASN = ""
 	vars.sessions_down = ""
 }
+
+#######################################################################################
+# UPS checks
+#######################################################################################
+object CheckCommand "check_ups" {
+	import "plugin-check-command"
+	command = PluginDir + "/check_snmp -H $host$ -P 1 -C openfest --oid $OID$ --miblist=UPS-MIB -r $value$"
+	vars.host=""
+	vars.OID=""
+	vars.value=""
+	timeout = "120"
+}
diff --git a/monitoring/icinga2/conf.d/groups.conf b/monitoring/icinga2/conf.d/groups.conf
index 4ecbf81..1be7907 100644
--- a/monitoring/icinga2/conf.d/groups.conf
+++ b/monitoring/icinga2/conf.d/groups.conf
@@ -83,3 +83,8 @@ object HostGroup "wifi" {
   display_name = "Access points"
   assign where "openwrt" in host.vars.groups
 }
+
+object HostGroup "ups" {
+  display_name = "UPS-es"
+  assign where "ups" in host.vars.groups
+}
diff --git a/monitoring/icinga2/conf.d/hosts/dell-ups.conf b/monitoring/icinga2/conf.d/hosts/dell-ups.conf
new file mode 100644
index 0000000..9fa93e3
--- /dev/null
+++ b/monitoring/icinga2/conf.d/hosts/dell-ups.conf
@@ -0,0 +1,31 @@
+object Host "dell-ups.openfest.org" {
+	import "generic-host"
+
+	address = "dell-ups"
+	vars.groups = [ "ups" ]
+
+	vars.ups[ "Battery Status" ] = {
+		OID = "1.3.6.1.2.1.33.1.2.1.0"
+		value = 2
+	}
+	vars.ups[ "Seconds on Battery" ] = {
+		OID = "1.3.6.1.2.1.33.1.2.2.0"
+		value = 0
+	}
+	vars.ups[ "Estimated Min Remaining" ] = {
+		OID = "1.3.6.1.2.1.33.1.2.3.0"
+	}
+	vars.ups[ "Estimated Charge Remaining" ] = {
+		OID = "1.3.6.1.2.1.33.1.2.4.0"
+	}
+	vars.ups[ "Temperature" ] = {
+		OID = "1.3.6.1.2.1.33.1.2.7.0"
+	}
+
+	vars.notification["slack"] = {
+		groups = [ "icingaadmins" ]
+	}
+
+
+}
+