X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=itl%2Fcommand-plugins-windows.conf;h=22ab623b98891b74220fff547788a3a89e2a0e35;hb=438da67209fd48a70a22aabafb2a6695c37aa9b4;hp=11d27348524821c5a961f78b188872acfb088cd9;hpb=eabb54eab689edc2a9b2e49a2e82969aeee72c04;p=icinga2

diff --git a/itl/command-plugins-windows.conf b/itl/command-plugins-windows.conf
index 11d273485..22ab623b9 100644
--- a/itl/command-plugins-windows.conf
+++ b/itl/command-plugins-windows.conf
@@ -1,25 +1,8 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://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.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 object CheckCommand "disk-windows" {
 	command = [ PluginDir + "/check_disk.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$disk_win_warn$"
@@ -42,15 +25,21 @@ object CheckCommand "disk-windows" {
 			value = "$disk_win_exclude$"
 			description = "Exclude these drives from check"
 		}
+		"-U" = {
+			set_if = "$disk_win_show_used$"
+			description = "Work with used instead of free space"
+		}
 	}
-	
-	vars.disk_win_unit = "mb"
+
 	//The default
+	vars.disk_win_unit = "mb"
+	vars.disk_win_warn = "20%"
+	vars.disk_win_crit = "10%"
 }
-	
+
 object CheckCommand "load-windows" {
 	command = [ PluginDir + "/check_load.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$load_win_warn$"
@@ -65,7 +54,7 @@ object CheckCommand "load-windows" {
 
 object CheckCommand "memory-windows" {
 	command = [ PluginDir + "/check_memory.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$memory_win_warn$"
@@ -79,14 +68,21 @@ object CheckCommand "memory-windows" {
 			value = "$memory_win_unit$"
 			description = "Use this unit to display memory"
 		}
+		"-U" = {
+                        set_if = "$memory_win_show_used$"
+                        description = "Show used memory instead of the free memory"
+                }
 	}
-	vars.memory_win_unit = "mb"
+
 	//The default
+	vars.memory_win_unit = "mb"
+	vars.memory_win_warn = "10%"
+	vars.memory_win_crit = "5%"
 }
 
 object CheckCommand "network-windows" {
 	command = [ PluginDir + "/check_network.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$network_win_warn$"
@@ -106,7 +102,7 @@ object CheckCommand "network-windows" {
 
 object CheckCommand "perfmon-windows" {
 	command = [ PluginDir + "/check_perfmon.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$perfmon_win_warn$"
@@ -129,11 +125,14 @@ object CheckCommand "perfmon-windows" {
 			value = "$perfmon_win_type$"
 			description = "Performance counter type"
 		}
+		"--perf-syntax" = {
+			value = "$perfmon_win_syntax$"
+			description = "Use this instead of the counter name in the perfomance data"
+		}
 	}
-	
+
 	vars.performance_win_wait = 1000
 	vars.perfmon_win_type = "double"
-	//The default values
 }
 
 
@@ -163,10 +162,9 @@ template CheckCommand "ping-common-windows" {
 			description = "Timeout in ms"
 		}
 	}
-	
+
 	vars.ping_win_packets = "5"
 	vars.ping_win_timeout = "1000"
-	//The default values
 }
 
 object CheckCommand "ping-windows" {
@@ -194,7 +192,7 @@ object CheckCommand "ping6-windows" {
 
 object CheckCommand "procs-windows" {
 	command = [ PluginDir + "/check_procs.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$procs_win_warn$"
@@ -213,7 +211,7 @@ object CheckCommand "procs-windows" {
 
 object CheckCommand "service-windows" {
 	command = [ PluginDir + "/check_service.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			set_if = "$service_win_warn$"
@@ -224,12 +222,16 @@ object CheckCommand "service-windows" {
 			required = true
 			description = "Service to check"
 		}
+		"--description" = {
+			set_if = "$service_win_description$"
+			description = "Use service description instead of name"
+		}
 	}
 }
 
 object CheckCommand "swap-windows" {
 	command = [ PluginDir + "/check_swap.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$swap_win_warn$"
@@ -243,28 +245,38 @@ object CheckCommand "swap-windows" {
 			value = "$swap_win_unit$"
 			description = "Unit to display swap in"
 		}
+		"-U" = {
+			set_if = "$swap_win_show_used$"
+			description = "Show used swap instead of the free swap"
+		}
 	}
-	
+
+	// Default
 	vars.swap_win_unit = "mb"
-	//The default
+	vars.swap_win_warn = "10%"
+	vars.swap_win_crit = "5%"
 }
 
 object CheckCommand "update-windows" {
 	command = [ PluginDir + "/check_update.exe" ]
-	
+
 	arguments = {
 		"-w" = {
-			set_if = "$update_win_warn$"
-			description = "Warn if there are important updates available"
+			value = "$update_win_warn$"
+			description = "Number of updates to trigger a warning"
 		}
 		"-c" = {
-			set_if = "$update_win_crit$"
-			description = "Critical if there are important updates that require a reboot"
+			value = "$update_win_crit$"
+			description = "Number of updates to trigger a critical"
 		}
 		"--possible-reboot" = {
 			set_if = "$update_win_reboot$"
 			description = "Treat 'may need update' as 'definitely needs update'"
 		}
+		"--no-reboot-critical" = {
+			set_if = "$ignore_reboot$"
+			description = "Do not automatically return critical if an update requiring reboot is present."
+		}
 	}
 
 	timeout = 5m
@@ -272,7 +284,7 @@ object CheckCommand "update-windows" {
 
 object CheckCommand "uptime-windows" {
 	command = [ PluginDir + "/check_uptime.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$uptime_win_warn$"
@@ -287,14 +299,13 @@ object CheckCommand "uptime-windows" {
 			description = "Time unit to use"
 		}
 	}
-	
+
 	vars.uptime_win_unit = "s"
-	//The default
 }
 
 object CheckCommand "users-windows" {
 	command = [ PluginDir + "/check_users.exe" ]
-	
+
 	arguments = {
 		"-w" = {
 			value = "$users_win_warn$"