Module: check_mk
Branch: master
Commit: ec08b644bc4dbe5b04c7e5e19f9400581c51c016
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec08b644bc4dbe…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 25 11:15:13 2011 +0100
FIX: mk_logwatch: dont use readlines(), save RAM
---
ChangeLog | 1 +
agents/plugins/mk_logwatch | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed30b95..c4a1994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
* FIX: cmctc: add scan function
* FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal
* FIX: ucd_cpu_util: fix check in case of missing hi, si and st
+ * FIX: mk_logwatch: improve implementation in order to save RAM
* printer_supply: Changed order of tests. When a printer reports -3 this
is used before the check if maxlevel is -2.
* printer_supply: Skipping inventory of supplies which have current value
diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch
index 567aae7..462054c 100755
--- a/agents/plugins/mk_logwatch
+++ b/agents/plugins/mk_logwatch
@@ -102,7 +102,7 @@ def read_config():
# /var/test/x12134.log|12345|32444355
def read_status():
status = {}
- for line in file(status_filename).readlines():
+ for line in file(status_filename):
# TODO: Remove variants with spaces. rsplit is
# not portale. split fails if logfilename contains
# spaces
@@ -179,7 +179,7 @@ def process_logfile(logfile, patterns):
f = os.fdopen(fl)
worst = 0
outputtxt = ""
- for line in f.readlines():
+ for line in f:
level = "."
for lev, pattern in patterns:
if pattern.search(line[:-1]):
Module: check_mk
Branch: master
Commit: d2675e506d767846441a1be2319f3fba6506932d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2675e506d7678…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Mar 25 09:42:59 2011 +0100
Updated bug entries
---
.bugs/184 | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/.bugs/184 b/.bugs/184
new file mode 100644
index 0000000..8336635
--- /dev/null
+++ b/.bugs/184
@@ -0,0 +1,18 @@
+Title: if/if64 problem when using description as item when having duplicate descr
+Component: checks
+Benefit: 6
+State: open
+Cost: 3
+Date: 2011-03-25 09:39:07
+Class: bug
+
+Der if/if64 Check unterschlägt doppelte Interfaces, wenn ein Host mehrere Interfaces
+mit dem gleichen Namen hat, sobald man die Description als Item benutzt.
+
+Man kann die Description kurzzeitig für diesen Host deaktivieren und die Inventur starten,
+dann werden alle Interfaces gefunden. Allerdings gehen die Dienste wieder verloren, wenn man
+später eine re-Inventur macht mit aktivierten Descriptions.
+
+Eventuell muss man das in der Inventur erkennen und dann die Interfaces selbs durchnummerieren.
+
+LM: Ich habe einen Dump von einem Beispiel-System.
Module: check_mk
Branch: master
Commit: 55dce37b26fd73877c8eacac19875dd6f72a2479
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55dce37b26fd73…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 25 08:22:20 2011 +0100
Call snmp(bulk)walk always with the option -Cc
---
ChangeLog | 2 ++
modules/check_mk.py | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b5ee877..ed30b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
CPU ressources)
* Agent simulation mode (for internal use and check development)
* Call snmpgetnext with the option -Cf (fixes some client errors)
+ * Call snmp(bulk)walk always with the option -Cc (fixes problems in some
+ cases where OIDs are missing)
Multisite:
* FIX: custom_style_sheet now also honored by sidebar
diff --git a/modules/check_mk.py b/modules/check_mk.py
index d80b9c9..ad6aaa0 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -519,7 +519,7 @@ def aggregated_service_name(hostname, servicedesc):
# options for authentication. This handles communities and
# authentication for SNMP V3. Also bulkwalk hosts
def snmp_walk_command(hostname):
- return snmp_base_command('walk', hostname)
+ return snmp_base_command('walk', hostname) + " -Cc"
# Constructs the basic snmp commands for a host with all important information
# like the commandname, SNMP version and credentials.
Module: check_mk
Branch: master
Commit: ca8b5074a2745c7aad6c9d57769f41cc8b1e9b94
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca8b5074a2745c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Mar 25 08:10:43 2011 +0100
Cleaned up directories
---
BI.fehlt | 14 +++++++++++---
figheader => doc/helpers/figheader | 0
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/BI.fehlt b/BI.fehlt
index 092d448..96efbe2 100644
--- a/BI.fehlt
+++ b/BI.fehlt
@@ -20,9 +20,6 @@ Modi, untern denen eine Aggr berechnet werden kann:
* mit 'force worst'
* Downtimeanalyse (Downtime wie crit behandeln)
-Pending muss korrekt behandelt werden. Am einfachsten wäre ein
-eigener BI-Status dafür.
-
Berechtigungen für:
Aggregationen ansehen generell??
Assume state ausführen
@@ -45,9 +42,20 @@ FEATURE: Icon zum Assumen soll auch bei den normalen Icons erscheinen, wenn:
* Ãœberhaupt Aggregationen definiert sind (len(config.aggregations) > 0)
* Man das Recht dazu hat, was zu assumen
* Die (neue) display option dafür eingeschaltet ist.
+ * Man könnte auch anstelle der jetzt vorhandenen Legobausteine das Assume-Icon
+ malen?
FEATURE: Downtimes: sollte man hierfür nicht auch einen BI-Status machen?
Oder muss diese Information separat noch oben driften?
+Wenn ja, dann muss aber klar sein, ob der Status - wenn man die Downtimes
+ausklammern - grün wäre? Besser ist es so:
+Wenn das Aggregat rot ist gilt es dann als "in downtime", wenn alle Zustände,
+die zum rot beitragen, selbst in Downtime sind. Solange die Downtimes nur
+Komponenten betreffen, die nicht den kritischen Status hervorrufen,
+gilt es nicht als in Downtime?
+
+Das Aggregat gilt als "in downtime", wenn
+
FEATURE: Acknowledgements: Sollen wir diese auch nach oben leiten?
diff --git a/figheader b/doc/helpers/figheader
similarity index 100%
rename from figheader
rename to doc/helpers/figheader
Module: check_mk
Branch: master
Commit: 254ec4aad49c42d8528489f22bf706f83fcc1e79
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=254ec4aad49c42…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Mar 23 07:59:32 2011 +0100
updated ChangeLog
---
ChangeLog | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 508afbc..f77780b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,7 +51,7 @@
* windows_update: Added check to monitor windows update states on windows
clients. The check monitors the number of pending updates and checks if
a reboot is needed after updates have been installed.
- * FIX: Linux mk_oracle: Updated tablespace query to use 'used blocks' instead of 'user blocks'
+ * FIX: mk_oracle: Updated tablespace query to use 'used blocks' instead of 'user blocks'
* FIX: bluecoat_sensors: Using scale parameter provided by the host for reported values
Module: check_mk
Branch: master
Commit: dbabe349caa26432e2407885c0c8ab5ed4822766
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbabe349caa264…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 22 16:27:22 2011 +0100
Added README for setup in OMD
---
doc/README.setup_in_omd | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/doc/README.setup_in_omd b/doc/README.setup_in_omd
new file mode 100644
index 0000000..7ba6ed7
--- /dev/null
+++ b/doc/README.setup_in_omd
@@ -0,0 +1,28 @@
+How to install Check_MK into an exisiting OMD site
+==================================================
+This feature is experimental: You can install Check_MK
+into an existing OMD site by unpacking the installation
+tarball and running ./setup --yes as OMD site user.
+This will install Check_MK into the site's local/
+filesystem hierarchy.
+
+After that relogin (to make sure the shell really
+executes the new cmk command) and do a cmk -U in order
+to re-create your Nagios configuration.
+
+Uninstalling must be done manually. This can be
+done with the following commands provided that no
+other files you need are lying around below local!
+Use at your own risk!
+
+omd stop
+cd ~
+find local -type f | xargs rm
+cd etc/apache/conf.d
+ln -sfn ../../check_mk/apache.conf check_mk.conf
+cd ~/etc/nagios/nagios.d
+ln -sfn ../../mk-livestatus/nagios.cfg mk-livestatus.cfg
+rm -f ~/etc/check_mk/apache-local.conf
+rm -f ~/etc/mk-livestatus/nagios-local.cfg
+cmk -U
+omd start