Skip to content

Commit

Permalink
Fix code style violations in the ITL
Browse files Browse the repository at this point in the history 
fixes #12573
  • Loading branch information
@gunnarbeutner
gunnarbeutner committed Aug 28, 2016
1 parent 9f06140 commit 0e8edfa
Show file tree
Hide file tree
Showing 6 changed files with 186 additions and 147 deletions.
1 change: 0 additions & 1 deletion itl/command-nscp-local.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ if (!globals.contains("NscpPath")) {
NscpPath = dirname(msi_get_component_path("{5C45463A-4AE9-4325-96DB-6E239C034F93}"))
}


object CheckCommand "nscp-local" {
import "plugin-check-command"

Expand Down
19 changes: 19 additions & 0 deletions itl/plugins-contrib.d/metrics.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/******************************************************************************
* 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. *
******************************************************************************/

object CheckCommand "graphite" {
import "plugin-check-command"

Expand Down
19 changes: 19 additions & 0 deletions itl/plugins-contrib.d/network-services.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/******************************************************************************
* 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. *
******************************************************************************/

object CheckCommand "kdc" {
import "plugin-check-command"
import "ipv4-or-ipv6"
Expand Down
2 changes: 2 additions & 0 deletions itl/plugins-contrib.d/operating-system.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ object CheckCommand "yum" {

object CheckCommand "iostat" {
import "plugin-check-command"

command = [ PluginContribDir + "/check_iostat" ]

arguments = {
"-d" = {
value = "$iostat_disk$"
Expand Down
290 changes: 145 additions & 145 deletions itl/plugins-contrib.d/web.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,155 +63,155 @@ object CheckCommand "webinject" {
}

object CheckCommand "jmx4perl" {
import "plugin-check-command"
import "plugin-check-command"

command = [ PluginContribDir + "/check_jmx4perl" ]
command = [ PluginContribDir + "/check_jmx4perl" ]

arguments = {
"-u" = {
value = "$jmx4perl_url$"
description = "URL to agent web application (e.g. http://server:8080/jolokia/)"
}
"--product" = {
value = "$jmx4perl_product$"
description = "Name of app server product (e.g. jboss)"
}
"--alias" = {
value = "$jmx4perl_alias$"
description = "Alias name for attribute (e.g. MEMORY_HEAP_USED)"
}
"-m" = {
value = "$jmx4perl_mbean$"
description = "MBean name (e.g. java.lang:type=Memory)"
}
"-a" = {
value = "$jmx4perl_attribute$"
description = "Attribute name (e.g. HeapMemoryUsage)"
}
"-o" = {
value = "$jmx4perl_operation$"
description = "Operation to execute"
}
"--value" = {
value = "$jmx4perl_value$"
description = "Shortcut for specifying mbean/attribute/path. Slashes within names must be escaped with backslash"
}
"--delta" = {
value = "$jmx4perl_delta$"
description = "Switches on incremental mode. Optional argument are seconds used for normalizing."
}
"-p" = {
value = "$jmx4perl_path$"
description = "Inner path for extracting a single value from a complex attribute or return value (e.g. used)"
}
"--target" = {
value = "$jmx4perl_target$"
description = "JSR-160 Service URL specifing the target server"
}
"--target-user" = {
value = "$jmx4perl_target_user$"
description = "Username to use for JSR-160 connection"
}
"--target-password" = {
value = "$jmx4perl_target_password$"
description = "Password to use for JSR-160 connection"
}
"--proxy" = {
value = "$jmx4perl_proxy$"
description = "Proxy to use"
}
"--user" = {
value = "$jmx4perl_user$"
description = "User for HTTP authentication"
}
"--password" = {
value = "$jmx4perl_password$"
description = "Password for HTTP authentication"
}
"-n" = {
value = "$jmx4perl_name$"
description = "Name to use for output. Optional, by default a standard value based on the MBean and attribute will be used"
}
"--method" = {
value = "$jmx4perl_method$"
description = "HTTP method to use. Either get or post"
}
"-b" = {
value = "$jmx4perl_base$"
description = "Base name, which when given, interprets critical and warning values as relative in the range 0 .. 100%. Must be given in the form mbean/attribute/path"
}
"--base-mbean" = {
value = "$jmx4perl_base_mbean$"
description = "Base MBean name, interprets critical and warning values as relative in the range 0 .. 100%. Requires a base-attribute, too"
}
"--base-attribute" = {
value = "$jmx4perl_base_attribute$"
description = "Base attribute for a relative check. Used together with base-mbean"
}
"--base-path" = {
value = "$jmx4perl_base_path$"
description = "Base path for relative checks, where this path is used on the base attribute's value"
}
"--unit" = {
value = "$jmx4perl_unit$"
description = "Unit of measurement of the data retreived. Recognized values are [B|KB|MN|GB|TB] for memory values and [us|ms|s|m|h|d] for time values"
}
"--null" = {
value = "$jmx4perl_null$"
description = "Value which should be used in case of a null return value of an operation or attribute. Is null by default"
}
"--string" = {
set_if = "$jmx4perl_string$"
description = "Force string comparison for critical and warning checks"
}
"--numeric" = {
set_if = "$jmx4perl_numeric$"
description = "Force numeric comparison for critical and warning checks"
}
"-c" = {
value = "$jmx4perl_critical$"
description = "Critical threshold for value"
}
"-w" = {
value = "$jmx4perl_warning$"
description = "Warning threshold for value"
}
"-l" = {
value = "$jmx4perl_label$"
description = "Label to be used for printing out the result of the check. Placeholders can be used."
}
"--perfdata" = {
value = "$jmx4perl_perfdata$"
description = "Whether performance data should be omitted, which are included by default."
}
"--unknown-is-critical" = {
set_if = "$jmx4perl_unknown_is_critical$"
description = "Map UNKNOWN errors to errors with a CRITICAL status"
}
"-t" = {
value = "$jmx4perl_timeout$"
description = "Seconds before plugin times out (default: 15)"
}
"--config" = {
value = "$jmx4perl_config$"
description = "Path to configuration file."
}
"--server" = {
value = "$jmx4perl_server$"
description = "Symbolic name of server url to use, which needs to be configured in the configuration file."
}
"--check" = {
value = "$jmx4perl_check$"
description = "Name of a check configuration as defined in the configuration file, use array if you need arguments."
order = 1
repeat_key = false
}
arguments = {
"-u" = {
value = "$jmx4perl_url$"
description = "URL to agent web application (e.g. http://server:8080/jolokia/)"
}
"--product" = {
value = "$jmx4perl_product$"
description = "Name of app server product (e.g. jboss)"
}
"--alias" = {
value = "$jmx4perl_alias$"
description = "Alias name for attribute (e.g. MEMORY_HEAP_USED)"
}
"-m" = {
value = "$jmx4perl_mbean$"
description = "MBean name (e.g. java.lang:type=Memory)"
}
"-a" = {
value = "$jmx4perl_attribute$"
description = "Attribute name (e.g. HeapMemoryUsage)"
}
"-o" = {
value = "$jmx4perl_operation$"
description = "Operation to execute"
}
"--value" = {
value = "$jmx4perl_value$"
description = "Shortcut for specifying mbean/attribute/path. Slashes within names must be escaped with backslash"
}
"--delta" = {
value = "$jmx4perl_delta$"
description = "Switches on incremental mode. Optional argument are seconds used for normalizing."
}
"-p" = {
value = "$jmx4perl_path$"
description = "Inner path for extracting a single value from a complex attribute or return value (e.g. used)"
}
"--target" = {
value = "$jmx4perl_target$"
description = "JSR-160 Service URL specifing the target server"
}
"--target-user" = {
value = "$jmx4perl_target_user$"
description = "Username to use for JSR-160 connection"
}
"--target-password" = {
value = "$jmx4perl_target_password$"
description = "Password to use for JSR-160 connection"
}
"--proxy" = {
value = "$jmx4perl_proxy$"
description = "Proxy to use"
}
"--user" = {
value = "$jmx4perl_user$"
description = "User for HTTP authentication"
}
"--password" = {
value = "$jmx4perl_password$"
description = "Password for HTTP authentication"
}
"-n" = {
value = "$jmx4perl_name$"
description = "Name to use for output. Optional, by default a standard value based on the MBean and attribute will be used"
}
"--method" = {
value = "$jmx4perl_method$"
description = "HTTP method to use. Either get or post"
}
"-b" = {
value = "$jmx4perl_base$"
description = "Base name, which when given, interprets critical and warning values as relative in the range 0 .. 100%. Must be given in the form mbean/attribute/path"
}
"--base-mbean" = {
value = "$jmx4perl_base_mbean$"
description = "Base MBean name, interprets critical and warning values as relative in the range 0 .. 100%. Requires a base-attribute, too"
}
"--base-attribute" = {
value = "$jmx4perl_base_attribute$"
description = "Base attribute for a relative check. Used together with base-mbean"
}
"--base-path" = {
value = "$jmx4perl_base_path$"
description = "Base path for relative checks, where this path is used on the base attribute's value"
}
"--unit" = {
value = "$jmx4perl_unit$"
description = "Unit of measurement of the data retreived. Recognized values are [B|KB|MN|GB|TB] for memory values and [us|ms|s|m|h|d] for time values"
}
"--null" = {
value = "$jmx4perl_null$"
description = "Value which should be used in case of a null return value of an operation or attribute. Is null by default"
}
"--string" = {
set_if = "$jmx4perl_string$"
description = "Force string comparison for critical and warning checks"
}
"--numeric" = {
set_if = "$jmx4perl_numeric$"
description = "Force numeric comparison for critical and warning checks"
}
"-c" = {
value = "$jmx4perl_critical$"
description = "Critical threshold for value"
}
"-w" = {
value = "$jmx4perl_warning$"
description = "Warning threshold for value"
}
"-l" = {
value = "$jmx4perl_label$"
description = "Label to be used for printing out the result of the check. Placeholders can be used."
}
"--perfdata" = {
value = "$jmx4perl_perfdata$"
description = "Whether performance data should be omitted, which are included by default."
}
"--unknown-is-critical" = {
set_if = "$jmx4perl_unknown_is_critical$"
description = "Map UNKNOWN errors to errors with a CRITICAL status"
}
"-t" = {
value = "$jmx4perl_timeout$"
description = "Seconds before plugin times out (default: 15)"
}
"--config" = {
value = "$jmx4perl_config$"
description = "Path to configuration file."
}
"--server" = {
value = "$jmx4perl_server$"
description = "Symbolic name of server url to use, which needs to be configured in the configuration file."
}
"--check" = {
value = "$jmx4perl_check$"
description = "Name of a check configuration as defined in the configuration file, use array if you need arguments."
order = 1
repeat_key = false
}
}

vars.jmx4perl_url = "http://$address$:8080/jolokia"
vars.jmx4perl_string = false
vars.jmx4perl_numeric = false
vars.jmx4perl_unknown_is_critical = false
vars.jmx4perl_url = "http://$address$:8080/jolokia"
vars.jmx4perl_string = false
vars.jmx4perl_numeric = false
vars.jmx4perl_unknown_is_critical = false
}

object CheckCommand "squid" {
Expand Down
2 changes: 1 addition & 1 deletion itl/windows-plugins
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/

include "command-plugins-windows.conf"
include "command-plugins-windows.conf"

0 comments on commit 0e8edfa

Please sign in to comment.