Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64206 discussions

Check_MK Git: check_mk: Added missing table to linux oracle agent

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 81b0aa1837e4dce869561a6b8055c22e5c52d09b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81b0aa1837e4dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 08:30:13 2012 +0100 Added missing table to linux oracle agent --- agents/plugins/mk_oracle | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 3f5ecb3..77b01ba 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -133,7 +133,7 @@ for SID in $SIDS; do select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, sum(sh.blocks_free) free_blocks - from dba_temp_files f, dba_tablespaces t, v$temp_space_header sh + from v\$thread th, dba_temp_files f, dba_tablespaces t, v\$temp_space_header sh WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by,

12 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c172fa4d332430620e713cf7406a12599435015 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c172fa4d33243… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 08:31:26 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: cmkbench: always and ever disable the cpuspeed daemon now.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e546ea27198b33f5f13cd8168e178a0b057d940e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e546ea27198b33… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Feb 18 15:42:03 2012 +0100 cmkbench: always and ever disable the cpuspeed daemon now. --- doc/opt/benchmark/cmkbench.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index 6281ce3..41da7b7 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -32,6 +32,8 @@ if [ -r /etc/redhat-release ]; then # stop the firewall - i don't know how to carefully punch a hole. chkconfig iptables off service iptables stop + # and OMG also stop freq scaling + service cpuspeed off fi }

12 years, 7 months

Check_MK Git: check_mk: cmkbench.sh: add local checks to process more services.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 95926cb60ef7362daa8ea7638e73bee8e79f4a94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95926cb60ef736… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Feb 18 18:14:53 2012 +0100 cmkbench.sh: add local checks to process more services. --- doc/opt/benchmark/cmkbench.sh | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index 41da7b7..22f4dec 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -88,9 +88,16 @@ config_omd_central() get_cache() { - +# We build a ramdisk backed cache file for replaying agent outputs here. +# It'll match your test host which might not have all services we later configure. +# might change this by running an inventory and using that? if [ -x `which check_mk_agent` ]; then check_mk_agent > /dev/shm/cmk.cache + # now also fudge 20 local checks. + i=0 ; while [ 20 -gt $i ]; do + i=$(( $i + 1 )) + echo "0 daemon${i}_status - OK funky output" >> /dev/shm/cmk.cache + done else echo "Check_MK Agent fehlt" fi @@ -111,7 +118,7 @@ prepare() setup_central() { echo "all_hosts += [ 'localhost|tcp', ]" > /omd/sites/${central}/etc/check_mk/conf.d/server.mk - su - $central -c ". .profile && cmk -I" + su - $central -c ". .profile && cmk -I && cmk -O" siteconfig=/omd/sites/${central}/etc/check_mk/multisite.d/connections.mk echo "sites = {" > $siteconfig @@ -176,10 +183,11 @@ extra_service_conf["normal_check_interval"] = [ ] extra_host_conf["normal_check_interval"] = [ ( "100", ALL_HOSTS), -# ( "check-mk-vapor", ALL_HOSTS) ] legacy_checks += [ -# (( "check-mk-vapor", "Dummy", True), ALL_HOSTS), + (( "check-mk-vapor", "Dummy", True), ALL_HOSTS), + (( "check-mk-vapor", "Dummy2", True), ALL_HOSTS), + (( "check-mk-vapor", "Dummy3", True), ALL_HOSTS), # (( "check-mk-ping", "Ping", True), ALL_HOSTS), ] extra_nagios_conf += r""" @@ -210,9 +218,29 @@ checks += [ (ALL_HOSTS, "mem.used", None, memused_default_levels), # (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), # (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), - (ALL_HOSTS, "omd_status", 'zentrale', None), +# (ALL_HOSTS, "omd_status", 'zentrale', None), (ALL_HOSTS, "tcp_conn_stats", None, tcp_conn_stats_default_levels), (ALL_HOSTS, "uptime", None, None), + (ALL_HOSTS, "local", 'daemon10_status', ""), + (ALL_HOSTS, "local", 'daemon11_status', ""), + (ALL_HOSTS, "local", 'daemon12_status', ""), + (ALL_HOSTS, "local", 'daemon13_status', ""), + (ALL_HOSTS, "local", 'daemon14_status', ""), + (ALL_HOSTS, "local", 'daemon15_status', ""), + (ALL_HOSTS, "local", 'daemon16_status', ""), + (ALL_HOSTS, "local", 'daemon17_status', ""), + (ALL_HOSTS, "local", 'daemon18_status', ""), + (ALL_HOSTS, "local", 'daemon19_status', ""), + (ALL_HOSTS, "local", 'daemon1_status', ""), + (ALL_HOSTS, "local", 'daemon20_status', ""), + (ALL_HOSTS, "local", 'daemon2_status', ""), + (ALL_HOSTS, "local", 'daemon3_status', ""), + (ALL_HOSTS, "local", 'daemon4_status', ""), + (ALL_HOSTS, "local", 'daemon5_status', ""), + (ALL_HOSTS, "local", 'daemon6_status', ""), + (ALL_HOSTS, "local", 'daemon7_status', ""), + (ALL_HOSTS, "local", 'daemon8_status', ""), + (ALL_HOSTS, "local", 'daemon9_status', ""), ] ZZZ

12 years, 7 months

Check_MK Git: check_mk: cmkbench: apply service check interval to all services. limit default host check interval to one per 100 min.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c791a5425f8e11713047736078a282650cffa658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c791a5425f8e11… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Feb 19 23:58:28 2012 +0100 cmkbench: apply service check interval to all services. limit default host check interval to one per 100 min. --- doc/opt/benchmark/cmkbench.sh | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index 22f4dec..ed78b42 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -94,7 +94,7 @@ get_cache() if [ -x `which check_mk_agent` ]; then check_mk_agent > /dev/shm/cmk.cache # now also fudge 20 local checks. - i=0 ; while [ 20 -gt $i ]; do + i=0 ; while [ 32 -gt $i ]; do i=$(( $i + 1 )) echo "0 daemon${i}_status - OK funky output" >> /dev/shm/cmk.cache done @@ -179,7 +179,7 @@ EOF cat <<ZXY > /omd/sites/$site/etc/check_mk/conf.d/service.mk extra_service_conf["normal_check_interval"] = [ - ( "5", ALL_HOSTS, [ "PING" ] ), + ( "5", ALL_HOSTS, ALL_SERVICES ), ] extra_host_conf["normal_check_interval"] = [ ( "100", ALL_HOSTS), @@ -241,6 +241,18 @@ checks += [ (ALL_HOSTS, "local", 'daemon7_status', ""), (ALL_HOSTS, "local", 'daemon8_status', ""), (ALL_HOSTS, "local", 'daemon9_status', ""), + (ALL_HOSTS, "local", 'daemon21_status', ""), + (ALL_HOSTS, "local", 'daemon22_status', ""), + (ALL_HOSTS, "local", 'daemon23_status', ""), + (ALL_HOSTS, "local", 'daemon24_status', ""), + (ALL_HOSTS, "local", 'daemon25_status', ""), + (ALL_HOSTS, "local", 'daemon26_status', ""), + (ALL_HOSTS, "local", 'daemon27_status', ""), + (ALL_HOSTS, "local", 'daemon28_status', ""), + (ALL_HOSTS, "local", 'daemon29_status', ""), + (ALL_HOSTS, "local", 'daemon30_status', ""), + (ALL_HOSTS, "local", 'daemon31_status', ""), + (ALL_HOSTS, "local", 'daemon32_status', ""), ] ZZZ

12 years, 7 months

Check_MK Git: check_mk: cmkbench.sh now uses livecheck=yes/ no setting for real.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b471f476863dc7d89ea1aafff14faea4808ef469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b471f476863dc7… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Feb 18 14:27:10 2012 +0100 cmkbench.sh now uses livecheck=yes/no setting for real. --- doc/opt/benchmark/cmkbench.sh | 49 +++++++++++++--------------------------- 1 files changed, 16 insertions(+), 33 deletions(-) diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index 8db9abd..6281ce3 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -1,27 +1,4 @@ #!/bin/bash -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk 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 in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. if test -r /etc/check_mk/bench.cfg ; then . /etc/check_mk/bench.cfg @@ -74,6 +51,9 @@ config_omd_sites() gen_sites i=0 +if [ "$_livecheck" = "yes" ]; then + livecheck_string="livecheck=/omd/versions/default/lib/mk-livestatus/livecheck num_livecheck_helpers=${_livecheck_helpers}" +fi for site in ${sites} ; do i=$(( $i + 1 )) omd stop $site @@ -86,7 +66,7 @@ for site in ${sites} ; do omd config $site set APACHE_TCP_PORT $(( 5000 + $i )) omd config $site set LIVESTATUS_TCP_PORT $(( 6557 + $i )) # Bug - dont yet listen to livecheck y/n - echo "broker_module=/omd/sites/${site}/lib/mk-livestatus/livestatus.o livecheck=/omd/versions/default/lib/mk-livestatus/livecheck num_livecheck_helpers=${_livecheck_helpers} num_client_threads=20 pnp_path=/omd/sites/${site}/var/pnp4nagios/perfdata /omd/sites/${site}/tmp/run/live + echo "broker_module=/omd/sites/${site}/lib/mk-livestatus/livestatus.o $livecheck_string num_client_threads=20 pnp_path=/omd/sites/${site}/var/pnp4nagios/perfdata /omd/sites/${site}/tmp/run/live event_broker_options=-1" > /omd/sites/$site/etc/mk-livestatus/nagios.cfg done @@ -190,12 +170,15 @@ EOF cat <<ZXY > /omd/sites/$site/etc/check_mk/conf.d/service.mk extra_service_conf["normal_check_interval"] = [ -# ( "0.0166", ALL_HOSTS, [ "Dummy" ] ), - ( "0.0166", ALL_HOSTS, [ "Ping" ] ), + ( "5", ALL_HOSTS, [ "PING" ] ), +] +extra_host_conf["normal_check_interval"] = [ + ( "100", ALL_HOSTS), +# ( "check-mk-vapor", ALL_HOSTS) ] legacy_checks += [ # (( "check-mk-vapor", "Dummy", True), ALL_HOSTS), - (( "check-mk-ping", "Ping", True), ALL_HOSTS), +# (( "check-mk-ping", "Ping", True), ALL_HOSTS), ] extra_nagios_conf += r""" define command { @@ -217,14 +200,14 @@ checks += [ (ALL_HOSTS, "cpu.threads", None, threads_default_levels), (ALL_HOSTS, "df", '/', {}), (ALL_HOSTS, "df", '/opt', {}), - (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels), - (ALL_HOSTS, "kernel", 'Context Switches', kernel_default_levels), - (ALL_HOSTS, "kernel", 'Major Page Faults', kernel_default_levels), - (ALL_HOSTS, "kernel", 'Process Creations', kernel_default_levels), +# (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels), +# (ALL_HOSTS, "kernel", 'Context Switches', kernel_default_levels), +# (ALL_HOSTS, "kernel", 'Major Page Faults', kernel_default_levels), +# (ALL_HOSTS, "kernel", 'Process Creations', kernel_default_levels), (ALL_HOSTS, "kernel.util", None, kernel_util_default_levels), (ALL_HOSTS, "mem.used", None, memused_default_levels), - (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), - (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), +# (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), +# (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), (ALL_HOSTS, "omd_status", 'zentrale', None), (ALL_HOSTS, "tcp_conn_stats", None, tcp_conn_stats_default_levels), (ALL_HOSTS, "uptime", None, None),

12 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22a7cffd94a1c4ca1c67747d190ac0436bf03b93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22a7cffd94a1c4… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Feb 18 14:28:37 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 7 months

Check_MK Git: check_mk: gb choice supports tuple

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5980d7c7b4ef96cf99507078c6621a244dab3bba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5980d7c7b4ef96… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 17 16:55:25 2012 +0100 gb choice supports tuple --- gb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/gb b/gb index 3072aae..076fa51 100755 --- a/gb +++ b/gb @@ -375,6 +375,8 @@ def input_choice(what, choices): ctc = {} texts = [] for choice in choices: + if type(choice) == tuple: + choice = choice[0] for c in choice: if c not in ".-_/" and c not in ctc: ctc[c] = choice

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0657

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 77301c3445e54251ef3e7a9970a2269ce7420264 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77301c3445e542… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 17 16:56:52 2012 +0100 Updated bug entries #0657 --- .bugs/657 | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/.bugs/657 b/.bugs/657 index a1d2926..a6fbc9c 100644 --- a/.bugs/657 +++ b/.bugs/657 @@ -5,8 +5,4 @@ State: closed Date: 2012-02-17 15:18:08 Targetversion: future -Änderungen im omd Paket -In der WATO Eingabemaske existieren Pflichtfelder(mandatory), die Aufgrund des Rechnertyps -nicht benoetigt werden und daher ausgeblendet sind. -2012-02-17 16:45:44: changed state open -> closed

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0660

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38649ec7a8cd0c8f84f26edb6eaa60e9c53da9dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38649ec7a8cd0c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 17 16:53:32 2012 +0100 Updated bug entries #0660 --- .bugs/658 | 6 +++--- .bugs/659 | 9 +++++---- .bugs/660 | 21 ++++++--------------- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/.bugs/658 b/.bugs/658 index 5940ba9..c7d1ce4 100644 --- a/.bugs/658 +++ b/.bugs/658 @@ -1,10 +1,10 @@ -Title: "omd su" aufbohren +Title: "omd su" upgrade Component: core State: open Date: 2012-02-17 15:41:07 Targetversion: future Class: feature -"omd su" könnte direkt die Site wechseln, wenn es nur eine Site gibt. -Wenn man keine Site angibt, dann soll ein dialog hochkokmmen. +"omd su" should switch directly to a site, if there is only one present +if no sitename is given, a dialog may open up diff --git a/.bugs/659 b/.bugs/659 index a53e0d5..011f48a 100644 --- a/.bugs/659 +++ b/.bugs/659 @@ -1,10 +1,11 @@ -Title: Host validierungsfehler schliesst nicht das host edit fenster +Title: Host validation error does invalidate the _transid of the current page Component: wato State: open Date: 2012-02-17 15:42:32 Targetversion: future Class: bug -Es scheint so als ob man nichts mehr im aktuellen Fenster speichern kann -wenn ein Validierungsfehler angezeigt wurde. -Man muss erst zurueck zum folder und dann erst wieder in den host edit dialog +If a host validation error occurs on saving a host, the user needs to return +to the folder an re-edit the host from start. +It seems that the transaction id of the current page gets invalid, and a +subsequent save on the same page wont work diff --git a/.bugs/660 b/.bugs/660 index f54a718..4401716 100644 --- a/.bugs/660 +++ b/.bugs/660 @@ -1,20 +1,11 @@ -Title: WATO: unsichtbare mandatory attribute +Title: WATO: invisible mandatory attributes Component: wato -State: open +Class: bug +State: closed Date: 2012-02-17 15:43:57 Targetversion: future -Class: bug - -Wir haben Betriebsmitteltypen bei denen die meisten der Attribute ausgeblendet sind -Beispielsweise der SWITCH -In dk.py sind allerdings viele Attribute als mandatory hinterlegt( hostdb_server, etc. ) -Momentan haben wir den workaround, dass sich die Attribute ueber die Ordnerstruktur hineinvererben lassen -Das kann aber kein Dauerzustand sein. Sobald man die Hosts in einen frischen Ordner verschiebt gehts schief. +duplicate -Problem: -Ueber die Sichtbarkeit wird erst im Javascript Context entschieden, je nachdem wie die -host_tags aktuell gesetzt sind. Diese Information fehlt in der Einzelvalidierung der Mandatory Attribute. -Da heisst es stur: Steht nix drin -> Fehler -Evtl. kann man ueber die html.var noch pruefen ob das Attribut eingeblendet ist und dann erst -die enstprechende Validierung starten +2012-02-17 16:53:25: changed state open -> closed +duplicate

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits