Module: check_mk
Branch: master
Commit: 9f90a27cf4ba8456a27b6681e2baed785d00b4a1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f90a27cf4ba84…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Feb 12 13:08:06 2013 +0100
fixed merge conflict artifacts
---
checks/oracle_tablespaces | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces
index 2cf3093..273fa0f 100644
--- a/checks/oracle_tablespaces
+++ b/checks/oracle_tablespaces
@@ -154,18 +154,9 @@ def check_oracle_tablespaces(item, params, info):
increment_size = 0
free_space = 0
-<<<<<<< HEAD
# Conversion of old autochecks params
if type(params) == tuple:
params = { "autoextend" : params[0], "levels" : params[1:] }
-=======
- if type(params) == tuple:
- autoext, warn, crit = params
- else:
- autoext = params["autoextend"]
- warn, crit = params["levels"]
- # TODO: magic
->>>>>>> mknotifyd update
autoext = params.get("autoextend")
uses_default_increment = False
@@ -271,12 +262,8 @@ check_info['oracle_tablespaces'] = {
"check_function" : check_oracle_tablespaces,
"inventory_function" : inventory_oracle_tablespaces,
"has_perfdata" : True,
-<<<<<<< HEAD
"group" : "oracle_tablespaces",
"default_levels_variable" : "oracle_tablespaces_default_levels",
"includes" : [ "oracle.include" ]
-=======
-# "default_levels_variable" : "oracle_tablespaces_default_levels"
->>>>>>> mknotifyd update
}
check_config_variables.append("oracle_tablespaces_check_default_increment")