Module: check_mk
Branch: master
Commit: 73671cff39a71ab78fa9f965094e49113e834642
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73671cff39a71a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Sep 15 09:43:43 2014 +0200
Removed further trailing spaces
---
Makefile | 4 ++--
agents/cfg_examples/jolokia.cfg | 2 +-
agents/cfg_examples/logwatch.cfg | 2 +-
agents/cfg_examples/sqlplus.sh | 4 ++--
agents/check_mk_caching_agent.linux | 2 +-
agents/special/agent_emcvnx | 2 +-
agents/special/agent_hivemanager | 6 +++---
agents/special/agent_innovaphone | 12 ++++++------
agents/special/agent_random | 2 +-
agents/special/agent_vsphere | 2 +-
agents/special/agent_vsphere.pysphere | 6 +++---
agents/waitmax.c | 8 ++++----
12 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile
index 9ccd4aa..f0436eb 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/*
inventory/* \
$$(find pnp-templates -type f -name "*.php") \
mkeventd/bin/mkeventd mkeventd/web/htdocs/*.py mkeventd/web/plugins/*/*.py
\
mkeventd/src/*.c mkeventd/checks/* check_mk_templates.cfg \
- doc/treasures/mknotifyd agents/check_mk_agent* \
- $$(find agents/plugins -type f)
+ doc/treasures/mknotifyd agents/check_mk_*agent* agents/*.c agents/cfg_examples/*
\
+ agents/special/* $$(find agents/plugins -type f)
.PHONY: help install clean
diff --git a/agents/cfg_examples/jolokia.cfg b/agents/cfg_examples/jolokia.cfg
index c9bfd2a..75abc26 100644
--- a/agents/cfg_examples/jolokia.cfg
+++ b/agents/cfg_examples/jolokia.cfg
@@ -36,7 +36,7 @@ instance = None
# Configuration for multiple instances. Not-specified
# values will be taken from the upper settings
# instances = [
-# {
+# {
# "port" : 8080,
# "instance" : "FOO",
# },
diff --git a/agents/cfg_examples/logwatch.cfg b/agents/cfg_examples/logwatch.cfg
index 238bcb8..8fec948 100644
--- a/agents/cfg_examples/logwatch.cfg
+++ b/agents/cfg_examples/logwatch.cfg
@@ -30,7 +30,7 @@
/var/log/messages
# Patterns are indented with one space are prefixed with:
# C: Critical messages
-# W: Warning messages
+# W: Warning messages
# I: ignore these lines (OK)
# R: Rewrite the output previous match. You can use \1, \2 etc. for refer to groups (.*)
of this match
# The first match decided. Lines that do not match any pattern
diff --git a/agents/cfg_examples/sqlplus.sh b/agents/cfg_examples/sqlplus.sh
index 2fd8d73..a561a1d 100755
--- a/agents/cfg_examples/sqlplus.sh
+++ b/agents/cfg_examples/sqlplus.sh
@@ -25,8 +25,8 @@
# EXAMPLE
-# This script is called by the Check_MK ORACLE plugin in order to
-# execute an SQL query.
+# This script is called by the Check_MK ORACLE plugin in order to
+# execute an SQL query.
# It is your task to adapt this script so that the ORACLE environment
# is setup and the correct user chosen to execute sqlplus.
diff --git a/agents/check_mk_caching_agent.linux b/agents/check_mk_caching_agent.linux
index 32e53dc..896a591 100755
--- a/agents/check_mk_caching_agent.linux
+++ b/agents/check_mk_caching_agent.linux
@@ -50,7 +50,7 @@
export MK_CACHEDIR="/var/cache/check_mk"
# Determine the IP address of the remote Nagios server.
-# xinetd sends us the IP address of the remote host via
+# xinetd sends us the IP address of the remote host via
# the environment variable REMOTE_HOST. SSH sets a variable
# SSH_CONNECTION where the remote IP address is the first
# part of a space-separated list. Of both fails, we set
diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx
index de3b388..4dc7bdd 100755
--- a/agents/special/agent_emcvnx
+++ b/agents/special/agent_emcvnx
@@ -102,7 +102,7 @@ password = None
mortypes = [ 'all' ]
fetch_agent_info = False
-naviseccli_options = {
+naviseccli_options = {
"disks" : {"cmd_option" : "-disk",
"active" : False},
"hba" : {"cmd_option" : "-hba",
"active" : False},
"hwstatus" : {"cmd_option" : "-array",
"active" : False},
diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager
index 80bfb40..855128e 100755
--- a/agents/special/agent_hivemanager
+++ b/agents/special/agent_hivemanager
@@ -31,7 +31,7 @@ import urllib2, base64, json
try:
ip = sys.argv[1]
user = sys.argv[2]
- password = sys.argv[3]
+ password = sys.argv[3]
except:
print "Usage: agent_hivemanager <IP> <USERNAME>
<PASSWORD>"
sys.exit(2)
@@ -39,7 +39,7 @@ except:
def get_url(address):
request = urllib2.Request(address)
base64string = base64.encodestring('%s:%s' % (user,
password)).replace('\n', '')
- request.add_header("Authorization", "Basic %s" % base64string)
+ request.add_header("Authorization", "Basic %s" % base64string)
request.add_header("Content-Type", "application/json")
try:
return urllib2.urlopen(request)
@@ -48,7 +48,7 @@ def get_url(address):
sys.exit(2)
print "<<<check_mk>>>"
-print "Version: 1.2.5"
+print "Version: 1.2.5"
print "AgentOs: Hivemanager"
print "<<<hivemanager_devices:sep(124)>>>"
diff --git a/agents/special/agent_innovaphone b/agents/special/agent_innovaphone
index 7a9d773..8c8f03c 100755
--- a/agents/special/agent_innovaphone
+++ b/agents/special/agent_innovaphone
@@ -31,17 +31,17 @@ import urllib2, base64
server = sys.argv[1]
user = sys.argv[2]
-password = sys.argv[3]
+password = sys.argv[3]
def get_url(address):
request = urllib2.Request(address)
base64string = base64.encodestring('%s:%s' % (user,
password)).replace('\n', '')
- request.add_header("Authorization", "Basic %s" % base64string)
+ request.add_header("Authorization", "Basic %s" % base64string)
return urllib2.urlopen(request)
def get_informations(name, xml_id, org_name):
data_url = "/LOG0/CNT/mod_cmd.xml?cmd=xml-count&x="
- address = "http://%s%s%s" % ( server, data_url, xml_id )
+ address = "http://%s%s%s" % ( server, data_url, xml_id )
c = False
for line in etree.parse(get_url(address)).getroot():
for child in line:
@@ -53,7 +53,7 @@ def get_informations(name, xml_id, org_name):
def get_pri_channel(channel_name):
data_url = "/%s/mod_cmd.xml" % channel_name
- address = "http://%s%s" % ( server, data_url)
+ address = "http://%s%s" % ( server, data_url)
data = etree.parse(get_url(address)).getroot()
link = data.get('link')
physical = data.get('physical')
@@ -74,8 +74,8 @@ def get_licenses():
data = etree.parse(get_url(address)).getroot()
for child in data.findall('lic'):
if child.get('name') == "Port":
- count = child.get('count')
- used = child.get('used')
+ count = child.get('count')
+ used = child.get('used')
print count, used
break
diff --git a/agents/special/agent_random b/agents/special/agent_random
index 6d84745..1350757 100755
--- a/agents/special/agent_random
+++ b/agents/special/agent_random
@@ -60,7 +60,7 @@ services = [
print '<<<local>>>'
state_names = [ "OK", "WARN", "CRIT", "UNKNOWN"
]
-state_texts = [
+state_texts = [
"Everying is OK now",
"The freibl might go slisk",
"Bad luck, everything is broken",
diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere
index 9f97aad..8d2410a 100755
--- a/agents/special/agent_vsphere
+++ b/agents/special/agent_vsphere
@@ -25,7 +25,7 @@
# Boston, MA 02110-1301 USA.
# This agent version uses predefined soap inquiries which are sent
-# to an esx host system. # Unlike the classic agent the reported data
+# to an esx host system. # Unlike the classic agent the reported data
# isn't processed through the pysphere module.
# Instead a simple string process approach is used which drastically
# reduces the CPU load for this agent
diff --git a/agents/special/agent_vsphere.pysphere
b/agents/special/agent_vsphere.pysphere
index 0ad82fe..9a659d5 100755
--- a/agents/special/agent_vsphere.pysphere
+++ b/agents/special/agent_vsphere.pysphere
@@ -532,12 +532,12 @@ def output_hostsystem_counters(all_counters = False):
131078, 131079, 131091, 131076, 131077,
]
-
+
#needed_ids = [
# # sys.resourceMem*
# 262151, 262155, 262169, 262152, 262154, 262153, 262157, 262156, 262168,
#]
-
+
# Seems as this is not available in ESX 5.0 but we saw it on 5.1
if esx_version_num > 5.0:
# sys.resourceMemConsumed
@@ -649,7 +649,7 @@ def output_mors(what, properties, direct=False):
g_datastores = {}
def output_datastores():
- property_names = [
+ property_names = [
"name",
"summary.freeSpace",
"summary.capacity",
diff --git a/agents/waitmax.c b/agents/waitmax.c
index 78c031b..de09216 100644
--- a/agents/waitmax.c
+++ b/agents/waitmax.c
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
+#include <errno.h>
#include <signal.h>
#include <getopt.h>
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
int maxtime = atoi(argv[optind]);
if (maxtime <= 0) usage();
-
+
g_pid = fork();
if (g_pid == 0) {
signal(SIGALRM, signalhandler);
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
out("\n");
exit(253);
}
-
+
signal(SIGALRM, signalhandler);
alarm(maxtime);
int status;
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
}
else break;
}
-
+
if (WIFEXITED(status)) {
int exitcode = WEXITSTATUS(status);
return exitcode;