[checkmk-commits] Check_MK Git: check_mk: Remove several trailing spaces

Module: check_mk Branch: master Commit: 73f96248342f837adbeb3b9ee5219213b3c3ce06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73f96248342f83… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Jan 26 16:38:29 2015 +0100 Remove several trailing spaces --- agents/check_mk_agent-1.2.7i1-1.noarch.rpm | Bin 20213 -> 20211 bytes agents/check_mk_agent.freebsd | 4 ++-- agents/check_mk_agent.hpux | 2 +- agents/windows/Makefile | 2 +- checkman/oracle_recovery_status | 8 ++++---- checks/bluecat_dhcp | 6 +++--- checks/cisco_qos | 2 +- livestatus/src/StatusSpecialIntColumn.h | 2 +- pnp-templates/check_mk-mem.linux.php | 4 ++-- web/htdocs/js/dashboard.js | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm b/agents/check_mk_agent-1.2.7i1-1.noarch.rpm index e4e78b3..9374805 100644 Binary files a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm and b/agents/check_mk_agent-1.2.7i1-1.noarch.rpm differ diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index b517fbe..d39c600 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -253,11 +253,11 @@ if which MegaCli >/dev/null ; then fi -# OpenVPN Clients. +# OpenVPN Clients. # Correct log location unknown, sed call might also be broken if [ -e /var/log/openvpn/openvpn-status.log ] ; then echo '<<<openvpn_clients:sep(44)>>>' - sed -n -e '/CLIENT LIST/,/ROUTING TABLE/p' < /var/log/openvpn/openvpn-status.log | sed -e 1,3d -e '$d' + sed -n -e '/CLIENT LIST/,/ROUTING TABLE/p' < /var/log/openvpn/openvpn-status.log | sed -e 1,3d -e '$d' fi diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 49b3571..bc426c0 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -58,7 +58,7 @@ echo AgentDirectory: $MK_CONFDIR # modern systems with vxfs only here. The filesystem type is currently # not used by the check anyway. echo '<<<df>>>' -df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -Ev "^/proc|^Filesystem|^/aha|:" +df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -Ev "^/proc|^Filesystem|^/aha|:" # Process table: HP-UX does not provide a resident size of processes. # We send a 0 here for RSZ. diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 45b0b0a..5a496b6 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -53,7 +53,7 @@ fix_linebreaks: sed -i 's/\r//' $$F ; \ sed -i 's/$$/\r/' $$F ; \ fi ; \ - done + done # ----------------------------------------------------------------------------- # 1. Create ressource files with version and product information. Note: That file diff --git a/checkman/oracle_recovery_status b/checkman/oracle_recovery_status index ee43be4..5f42a03 100644 --- a/checkman/oracle_recovery_status +++ b/checkman/oracle_recovery_status @@ -13,7 +13,7 @@ description: Standard Edition Databases. There is an imporatnt difference between Primary and Standby Database. Primary will only create WARNINGs, when the level of levels is exceeded. A value for CRITICAL is only usable - when the Database is in Physical Standby Mode. + when the Database is in Physical Standby Mode. The 2nd function is the monitoring of datafiles in manual backup mode. This is important for database which are backed up with 'alter database @@ -21,12 +21,12 @@ description: for that backup type. If an end backup is missing and you restart the database you'll unable to open the database. - To prevent such situations, the state of the backup mode could be + To prevent such situations, the state of the backup mode could be monitored. The rule describes the maximum time for an active backup mode for a datafile until a WARN or CRIT is generated. {Important Information} - There is no checkpoint created if a database is in backup mode. It + There is no checkpoint created if a database is in backup mode. It is expected, that the checkpoint time could also reach a configured limit when a backup is running! This is not the case for Backups with RMAN. @@ -48,7 +48,7 @@ parameters (dict): "levels": (int, int) - Maximum time in seconds for warn and crit for the last Checkpoint over all Datafiles. No default value - "backup_age": (int, int) - Maximum time in seconds for warn and crit + "backup_age": (int, int) - Maximum time in seconds for warn and crit for datafiles in Online Backup Mode. inventory: diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp index c24564b..527d773 100644 --- a/checks/bluecat_dhcp +++ b/checks/bluecat_dhcp @@ -45,11 +45,11 @@ def check_bluecat_dhcp(item, params, info): 4 : "currently stopping", 5 : "fault" } - + ok_on_node = False states = {} state = 0 - + # Collect states of nodes for node, oper_state, leases in info: oper_state, leases_sec = map(int, (oper_state, leases)) @@ -65,7 +65,7 @@ def check_bluecat_dhcp(item, params, info): ok_on_node = node # Only needed in cluster: states[node] = {'oper_state' : oper_states[oper_state], 'leases_sec' : leases_sec, 'state' : temp_state } - + # Are we in a Cluster? if len(info) > 1: if ok_on_node: diff --git a/checks/cisco_qos b/checks/cisco_qos index 47e0669..6b515c5 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -267,7 +267,7 @@ def check_cisco_qos(item, params, info): perfdata_avg = [] min_value = ("0", "0.0")[unit == 'bit'] - for name, counter, warn, crit, min_val, max_val in [ + for name, counter, warn, crit, min_val, max_val in [ ( "post", post_b, post_warn, post_crit, min_value, bw), ( "drop", drop_b, drop_warn, drop_crit, min_value, bw), ]: diff --git a/livestatus/src/StatusSpecialIntColumn.h b/livestatus/src/StatusSpecialIntColumn.h index 56b4633..10e45ed 100644 --- a/livestatus/src/StatusSpecialIntColumn.h +++ b/livestatus/src/StatusSpecialIntColumn.h @@ -33,7 +33,7 @@ class StatusSpecialIntColumn : public IntColumn { int _type; public: - StatusSpecialIntColumn(string name, string description, int type) + StatusSpecialIntColumn(string name, string description, int type) : IntColumn(name, description, -1), _type(type) {} int32_t getValue(void *, Query *); }; diff --git a/pnp-templates/check_mk-mem.linux.php b/pnp-templates/check_mk-mem.linux.php index e6e51ee..a633cbe 100644 --- a/pnp-templates/check_mk-mem.linux.php +++ b/pnp-templates/check_mk-mem.linux.php @@ -33,12 +33,12 @@ foreach ($NAME as $i => $n) { $mem_defines[$n] = "DEF:$n=$RRDFILE[$i]:$DS[$i]:MAX "; } -function mem_area($varname, $color, $title, $stacked) +function mem_area($varname, $color, $title, $stacked) { return mem_curve("AREA", $varname, $color, $title, $stacked); } -function mem_line($varname, $color, $title, $stacked) +function mem_line($varname, $color, $title, $stacked) { return mem_curve("LINE1", $varname, $color, $title, $stacked); } diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index f813340..c18c33f 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -543,7 +543,7 @@ function dashlet_toggle_edit(dashlet_obj, edit) { else render_sizer(controls, nr, i, anchor_id, dashlet.h); } - + if (!is_dynamic(dashlet.w) && !is_dynamic(dashlet.h)) render_corner_resizers(controls, nr); }