Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64138 discussions

Check_MK Git: check_mk: perfdata_format now defaults to "pnp"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73c3b1766c50da8c13d8f15981e467b3f596e0f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c3b1766c50da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 10:08:04 2010 +0100 perfdata_format now defaults to "pnp" --- ChangeLog | 3 +++ LIESMICH.zutun | 2 -- main.mk | 5 ----- modules/check_mk.py | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc78dae..73bc1e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ * Inventory: Better error handling on invalid inventory result of checks * setup.sh: fix problem with missing package_info (only appears if setup is called from another directory) + * perfdata_format now defaults to "pnp". Previous default was "standard". + You might have to change that in main.mk if you are not using PNP (only + relevant for MRPE checks) Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 57f7413..5985abe 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -96,8 +96,6 @@ nur noch ohne MIB-Dateien. Das würde das ganze deutlich vereinfachen! filesystem_levels rausnehmen. Hinweis, dass check_parameters verwendet werden soll. -Perfdatenformat per Default auf 'pnp' - aggregation_output_format: Aggregation per Default auf mehrzeilige Ausgabe Direct rrd updates ganz entfernen. diff --git a/main.mk b/main.mk index 1f33794..ecd627c 100644 --- a/main.mk +++ b/main.mk @@ -1,8 +1,3 @@ # Put your host names here # all_hosts = [ 'localhost' ] all_hosts = [ ] - -# Are you using PNP4Nagios and MRPE checks? This will make PNP -# choose the correct template for standard Nagios checks: -# perfdata_format = "pnp" - diff --git a/modules/check_mk.py b/modules/check_mk.py index 7d45f4b..e9d5236 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -206,7 +206,7 @@ agent_min_version = 0 # warn, if plugin has not at least versio check_max_cachefile_age = 0 # per default do not use cache files when checking cluster_max_cachefile_age = 90 # secs. simulation_mode = False -perfdata_format = "standard" # also possible: "pnp" +perfdata_format = "pnp" # also possible: "standard" debug_log = None monitoring_host = "localhost" # your Nagios host max_num_processes = 50

13 years, 10 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e0b3f34b98277bee1194f471b89cbf5dc86bad6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e0b3f34b98277… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 09:56:24 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 10 months

Check_MK Git: check_mk: Added example check_mk.ini for windows agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3adb3e3ef13e7e5035e90de4ca65fef6ce26cbe1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3adb3e3ef13e7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 09:56:13 2010 +0100 Added example check_mk.ini for windows agent --- agents/windows/check_mk.ini | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini new file mode 100644 index 0000000..66cd833 --- /dev/null +++ b/agents/windows/check_mk.ini @@ -0,0 +1,4 @@ +[global] + +# Restrict access to certain IP addresses +only_from = 127.0.0.1 192.168.56.0/24

13 years, 10 months

Check_MK Git: check_mk: Added missing manpage

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7edf714ac3e1b6ef944a7a65803e94cc1d611f84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7edf714ac3e1b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 5 18:51:27 2010 +0100 Added missing manpage --- checkman/blade_blades | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/checkman/blade_blades b/checkman/blade_blades new file mode 100644 index 0000000..cf05d93 --- /dev/null +++ b/checkman/blade_blades @@ -0,0 +1,25 @@ +title: Check for blades in an IBM blade center +agents: snmp +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check verifies the present-, health- and power-state of a blade in an + IBM blade center. + + The check raises {CRITICAL} and {WARNING} states depending on the different states: + When a blade does not exist anymore the check becomes {CRITICAL}, when a blade has + been turned off the check becomes {WARNING} and when the health state of the blade + is reported as not ok it raises {WARNING} or {CRITICAL} depending on the severity. + +item: + Number of the blade (as string, not int). + +examples: + checks += [ + ( "hostabc", "blade_bays", "8", None) + ] + +inventory: + All blades in the system with the state 1 (present) are automatically + inventorized.

13 years, 10 months

Check_MK Git: check_mk: New check netapp_volumes: Checks on/ offline-condition and states of netapp volumes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8394d7a8c696916520891268c418bd82d3a8aff4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8394d7a8c69691… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 5 18:58:39 2010 +0100 New check netapp_volumes: Checks on/offline-condition and states of netapp volumes --- ChangeLog | 1 + checkman/netapp_volumes | 19 ++++++++ checks/netapp_volumes | 113 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 316071a..076bd66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -438,6 +438,7 @@ * New check heartbeat_rscstatus: Checks the local resource status of a heartbeat node * New check win_dhcp_pools: Checks the usage of Windows DHCP Server lease pools + * New check netapp_volumes: Checks on/offline-condition and states of netapp volumes Multisite: * New view showing all PNP graphs of services with the same description diff --git a/checkman/netapp_volumes b/checkman/netapp_volumes new file mode 100644 index 0000000..d2aaf12 --- /dev/null +++ b/checkman/netapp_volumes @@ -0,0 +1,19 @@ +title: Checks health and state of NetAPP volumes +agents: snmp +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check verifies the state and health of volumes defined in NetAPP systems. + + The check raises a {WARNING} when the state of the volume is {offline}. A {WARNING} + state is also raised when the health is reported as {reconstructing} all other states + which are not {normal} or {raid_dp} result in a {CRITICAL} state. + +item: + Name of the volume as defined in the system + +inventory: + All {local} volumes are automatically inventorized. + + diff --git a/checks/netapp_volumes b/checks/netapp_volumes new file mode 100644 index 0000000..e8c0b81 --- /dev/null +++ b/checks/netapp_volumes @@ -0,0 +1,113 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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. + +# Author: Lars Michelsen <lm(a)mathias-kettner.de> + +#.1.3.6.1.4.1.789.1.5.8.1.1.1 = INTEGER: 1 +#.1.3.6.1.4.1.789.1.5.8.1.1.2 = INTEGER: 2 +#.1.3.6.1.4.1.789.1.5.8.1.1.3 = INTEGER: 3 +#.1.3.6.1.4.1.789.1.5.8.1.2.1 = STRING: "vol0" +#.1.3.6.1.4.1.789.1.5.8.1.2.2 = STRING: "RvRBackup" +#.1.3.6.1.4.1.789.1.5.8.1.2.3 = STRING: "RundV" +#.1.3.6.1.4.1.789.1.5.8.1.3.1 = STRING: "67155442" +#.1.3.6.1.4.1.789.1.5.8.1.3.2 = STRING: "2600515058" +#.1.3.6.1.4.1.789.1.5.8.1.3.3 = STRING: "788575730" +#.1.3.6.1.4.1.789.1.5.8.1.4.1 = INTEGER: 1 +#.1.3.6.1.4.1.789.1.5.8.1.4.2 = INTEGER: 1 +#.1.3.6.1.4.1.789.1.5.8.1.4.3 = INTEGER: 1 +#.1.3.6.1.4.1.789.1.5.8.1.5.1 = STRING: "online" +#.1.3.6.1.4.1.789.1.5.8.1.5.2 = STRING: "online" +#.1.3.6.1.4.1.789.1.5.8.1.5.3 = STRING: "online" +#.1.3.6.1.4.1.789.1.5.8.1.6.1 = STRING: "raid_dp" +#.1.3.6.1.4.1.789.1.5.8.1.6.2 = STRING: "raid_dp" +#.1.3.6.1.4.1.789.1.5.8.1.6.3 = STRING: "raid_dp" +#.1.3.6.1.4.1.789.1.5.8.1.7.1 = STRING: "root, diskroot, nosnap=off, nosnapdir=off, minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, fractional_reserve=100, extent=off, try_first=volume_grow" +#.1.3.6.1.4.1.789.1.5.8.1.7.2 = STRING: "nosnap=off, nosnapdir=off, minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, fractional_reserve=100, extent=off, try_first=volume_grow" +#.1.3.6.1.4.1.789.1.5.8.1.7.3 = STRING: "nosnap=on, nosnapdir=on, minra=off, no_atime_update=off, raidtype=raid_dp, raidsize=16, nvfail=off, snapmirrored=off, resyncsnaptime=60, create_ucode=off, convert_ucode=off, maxdirsize=10485, fs_size_fixed=off, guarantee=volume, svo_enable=off, svo_checksum=off, svo_allow_rman=off, svo_reject_errors=off, no_i2p=off, fractional_reserve=100, extent=off, try_first=volume_grow" +#.1.3.6.1.4.1.789.1.5.8.1.8.1 = STRING: "1ddc9920-496e-11df-aae1-00a09800c998" +#.1.3.6.1.4.1.789.1.5.8.1.8.2 = STRING: "62ac1040-5a8d-11df-83fd-00a09800c998" +#.1.3.6.1.4.1.789.1.5.8.1.8.3 = STRING: "4edc66e0-d6a3-11df-8724-00a09800c998" +#.1.3.6.1.4.1.789.1.5.8.1.9.1 = STRING: "aggr0" +#.1.3.6.1.4.1.789.1.5.8.1.9.2 = STRING: "aggr0" +#.1.3.6.1.4.1.789.1.5.8.1.9.3 = STRING: "aggr0" +#.1.3.6.1.4.1.789.1.5.8.1.10.1 = INTEGER: 2 +#.1.3.6.1.4.1.789.1.5.8.1.10.2 = INTEGER: 2 +#.1.3.6.1.4.1.789.1.5.8.1.10.3 = INTEGER: 2 +#.1.3.6.1.4.1.789.1.5.8.1.11.1 = INTEGER: 1 +#.1.3.6.1.4.1.789.1.5.8.1.11.2 = INTEGER: 1 +#.1.3.6.1.4.1.789.1.5.8.1.11.3 = INTEGER: 1 +#.1.3.6.1.4.1.789.1.5.8.1.12.1 = "" +#.1.3.6.1.4.1.789.1.5.8.1.12.2 = "" +#.1.3.6.1.4.1.789.1.5.8.1.12.3 = "" +#.1.3.6.1.4.1.789.1.5.8.1.13.1 = "" +#.1.3.6.1.4.1.789.1.5.8.1.13.2 = "" +#.1.3.6.1.4.1.789.1.5.8.1.13.3 = "" + +netapp_volumes_owner = { + '1': 'local', + '2': 'partner', +} + +def inventory_netapp_volumes(checkname, info): + # Only inventorize local volumes + return [ (line[0], None) for line in info if netapp_volumes_owner.get(line[2], '') == 'local' ] + +def check_netapp_volumes(item, _not_used, info): + info = [ line for line in info if line[0] == item ][0] + + if len(info) != 5: + return (3, "UNKNOWN - Invalid SNMP response") + + name, fsid, owner, state, status = info + + output = 'FSID: %s, Owner: %s, ' % (fsid, netapp_volumes_owner.get(owner, 'UNKNOWN')) + + ret_state = 0 + output += 'State: %s' % state + if state == 'offline': + ret_state = 1 + output += ' (WARN)' + + output += ', Status: %s' % status + if status == 'reconstructing': + ret_state = 1 + output += ' (WARN)' + elif status not in [ 'normal', 'raid_dp' ]: + ret_state = 2 + output += ' (CRIT)' + + return (ret_state, "%s - %s" % (nagios_state_names[ret_state], output)) + +check_info["netapp_volumes"] = (check_netapp_volumes, "NetApp Vol %s", 0, inventory_netapp_volumes) +snmp_info["netapp_volumes"] = ( ".1.3.6.1.4.1.789.1.5.8.1", ["2", # volName + "3", # volFSID + "4", # volOwningHost + "5", # volState + "6", # volStatus + ] ) + +snmp_scan_functions['netapp_volumes'] = \ + lambda oid: oid("1.3.6.1.2.1.1.1.0").startswith('"NetApp Release')

13 years, 10 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 990dbd99cf7e15f9a485d21c008eaee7111649ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=990dbd99cf7e15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 5 18:58:57 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 10 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be64332280a1742ab9ffcbb197441cc511dfe8c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be64332280a174… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 5 17:50:41 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 10 months

Check_MK Git: check_mk: Added compile helper file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d256ef42541fe122e02ea7139567eb53051d6864 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d256ef42541fe1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 5 17:50:00 2010 +0100 Added compile helper file --- agents/windows/.f12 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/windows/.f12 b/agents/windows/.f12 new file mode 100644 index 0000000..8f58e6d --- /dev/null +++ b/agents/windows/.f12 @@ -0,0 +1 @@ +make

13 years, 10 months

Check_MK Git: check_mk: Windows agent: allow restriction to ip addresses with only_hosts (like xinetd)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5aed940f45f9f1d83adbe24467ad568327dce7b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5aed940f45f9f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 5 17:47:05 2010 +0100 Windows agent: allow restriction to ip addresses with only_hosts (like xinetd) --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 222 +++++++++++++++++++++++++++++++++++-- agents/windows/check_mk_agent.exe | Bin 93184 -> 94720 bytes 3 files changed, 212 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d87eb62..2462a12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * blade_blades: Added new check for checking the health-, present- and power-state of IBM Bladecenter blades * win_dhcp_pools: Several cleanups in check + * Windows agent: allow restriction to ip addresses with only_hosts (like xinetd) Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 778d009..a4f6ff3 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -52,10 +52,12 @@ #include <stdarg.h> #include <time.h> #include <string.h> +#include <strings.h> #include <locale.h> #include <unistd.h> #include <sys/types.h> #include <dirent.h> +#include <ctype.h> // isspace() #define CHECK_MK_VERSION "1.1.9i1" @@ -87,6 +89,16 @@ char g_agent_directory[256]; char g_current_directory[256]; char g_plugins_dir[256]; char g_local_dir[256]; +char g_config_file[256]; + +struct ipspec { + uint32_t address; + uint32_t netmask; +}; + +#define MAX_ONLY_FROM 32 +struct ipspec g_only_from[MAX_ONLY_FROM]; +unsigned int g_num_only_from = 0; #ifdef DEBUG @@ -1016,24 +1028,36 @@ void get_agent_dir(char *buffer, int size) *end = 0; // replace \ with string end => get directory of executable } size = dsize; + RegCloseKey(key); } - RegCloseKey(key); + else { + // If the agent is not installed as service, simply + // assume the current directory to be the agent + // directory (for test and adhoc mode) + strcpy(g_agent_directory, g_current_directory); + } + } -void output_data(SOCKET &out) +void section_check_mk(SOCKET &out) { - // make sure, output of numbers is not localized - setlocale(LC_ALL, "C"); - output(out, "<<<check_mk>>>\n"); output(out, "Version: %s\n", CHECK_MK_VERSION); output(out, "AgentOS: windows\n"); output(out, "WorkingDirectory: %s\n", g_current_directory); + output(out, "ConfigFile: %s\n", g_config_file); output(out, "AgentDirectory: %s\n", g_agent_directory); output(out, "PluginsDirectory: %s\n", g_plugins_dir); output(out, "LocalDirectory: %s\n", g_local_dir); +} +void output_data(SOCKET &out) +{ + // make sure, output of numbers is not localized + setlocale(LC_ALL, "C"); + + section_check_mk(out); section_df(out); section_ps(out); section_mem(out); @@ -1045,6 +1069,32 @@ void output_data(SOCKET &out) } +char *ipv4_to_text(uint32_t ip) +{ + static char text[32]; + snprintf(text, 32, "%u.%u.%u.%u", + ip & 255, + ip >> 8 & 255, + ip >> 16 & 255, + ip >> 24); + return text; +} + +bool check_only_from(uint32_t ip) +{ + if (g_num_only_from == 0) + return true; // no restriction set + + for (unsigned i=0; i<g_num_only_from; i++) + { + uint32_t signibits = ip & g_only_from[i].netmask; + if (signibits == g_only_from[i].address) + return true; + } + return false; +} + + void listen_tcp_loop() { WSADATA wsa; @@ -1091,15 +1141,19 @@ void listen_tcp_loop() struct timeval timeout; timeout.tv_sec = 0; timeout.tv_usec = 500000; + + SOCKADDR_IN remote_addr; + int addr_len = sizeof(SOCKADDR_IN); + if (1 == select(1, &fds, NULL, NULL, &timeout)) { - connection = accept(s, NULL, NULL); - debug("Habe accepted."); + connection = accept(s, (SOCKADDR *)&remote_addr, &addr_len); if (connection != INVALID_SOCKET) { - - debug("socket ist auch da."); - output_data(connection); - + uint32_t ip = 0; + if (remote_addr.sin_family == AF_INET) + ip = remote_addr.sin_addr.s_addr; + if (check_only_from(ip)) + output_data(connection); closesocket(connection); } } @@ -1347,16 +1401,162 @@ void determine_directories() snprintf(g_local_dir, sizeof(g_local_dir), "%s\\local", g_agent_directory); } +char *lstrip(char *s) +{ + while (isspace(*s)) + s++; + return s; +} + + +void rstrip(char *s) +{ + char *end = s + strlen(s); // point one beyond last character + while (end > s && isspace(*(end - 1))) { + end--; + } + *end = 0; +} + +char *strip(char *s) +{ + rstrip(s); + return lstrip(s); +} + +void add_only_from(char *value) +{ + if (g_num_only_from >= MAX_ONLY_FROM) { + fprintf(stderr, "Cannot handle more the %d entries for only_from\r\n", MAX_ONLY_FROM); + exit(1); + } + + unsigned a, b, c, d; + int bits = 32; + + if (strchr(value, '/')) { + if (5 != sscanf(value, "%u.%u.%u.%u/%u", &a, &b, &c, &d, &bits)) { + fprintf(stderr, "Invalid value %s for only_hosts\n", value); + exit(1); + } + } + else { + if (4 != sscanf(value, "%u.%u.%u.%u", &a, &b, &c, &d)) { + fprintf(stderr, "Invalid value %s for only_hosts\n", value); + exit(1); + } + } + + uint32_t ip = a + b * 0x100 + c * 0x10000 + d * 0x1000000; + uint32_t mask_swapped = 0; + for (int bit = 0; bit < bits; bit ++) + mask_swapped |= 0x80000000 >> bit; + uint32_t mask; + unsigned char *s = (unsigned char *)&mask_swapped; + unsigned char *t = (unsigned char *)&mask; + t[3] = s[0]; + t[2] = s[1]; + t[1] = s[2]; + t[0] = s[3]; + g_only_from[g_num_only_from].address = ip; + g_only_from[g_num_only_from].netmask = mask; + + if ((ip & mask) != ip) { + fprintf(stderr, "Invalid only_hosts entry: host part not 0: %s/%u", + ipv4_to_text(ip), bits); + exit(1); + } + g_num_only_from ++; +} + +void parse_only_from(char *value) +{ + char *end = value + strlen(value); + while (value < end) { + value = lstrip(value); + char *s = value; + while (*s && !isspace(*s)) + s++; + *s = 0; + add_only_from(value); + value = s + 1; + } +} + +void handle_config_variable(char *var, char *value) +{ + if (!strcmp(var, "only_from")) { + parse_only_from(value); + } + else { + fprintf(stderr, "Invalid configuration variable %s.\r\n", var); + exit(1); + } +} + + +void read_config_file() +{ + snprintf(g_config_file, sizeof(g_config_file), "%s\\check_mk.ini", g_agent_directory); + FILE *file = fopen(g_config_file, "r"); + if (!file) { + g_config_file[0] = 0; + return; + } + + char line[512]; + int lineno = 0; + while (!feof(file)) { + if (!fgets(line, sizeof(line), file)) + return; + lineno ++; + char *l = strip(line); + if (l[0] == 0 || l[0] == '#' || l[0] == ';') + continue; // skip empty lines and comments + int len = strlen(l); + if (l[0] == '[' && l[len-1] == ']') { + // found section header + l[len-1] = 0; + char *section = l + 1; + if (strcmp(section, "global")) { + fprintf(stderr, "Invalid section %s in %s.\r\n", + section, g_config_file); + exit(1); + } + } + else { + // split up line at = sign + char *s = l; + while (*s && *s != '=') + s++; + if (*s != '=') { + fprintf(stderr, "Invalid line %d in %s.\r\n", + lineno, g_config_file); + exit(1); + } + *s = 0; + char *value = s + 1; + char *variable = l; + rstrip(variable); + value = strip(value); + handle_config_variable(variable, value); // add section later + } + } + +} int main(int argc, char **argv) { determine_directories(); + read_config_file(); + if (argc > 2) usage(); else if (argc <= 1) RunService(); else if (!strcmp(argv[1], "test")) do_test(); + else if (!strcmp(argv[1], "adhoc")) do_adhoc(); else if (!strcmp(argv[1], "install")) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e906449..4f02124 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

13 years, 10 months

Check_MK Git: check_mk: win_dhcp_pools.bat: Filtering additional error message

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c611b7ec36faffcd2ca576ee0e5ea6523447baaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c611b7ec36faff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 5 16:40:33 2010 +0100 win_dhcp_pools.bat: Filtering additional error message Conflicts: ChangeLog --- ChangeLog | 3 +++ agents/windows/plugins/win_dhcp_pools.bat | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 776fbd4..316071a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,9 @@ * tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried * heartbeat_nodes: fix Linux agent for hostname with upper case letters (thanks to Thorsten Robers) + * heartbeat_rscstatus: Catching empty output from agent correctly + * win_dhcp_pools agent plugin: Filtering additional error message on + systems without dhcp server Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/windows/plugins/win_dhcp_pools.bat b/agents/windows/plugins/win_dhcp_pools.bat index 497ea10..f90093a 100644 --- a/agents/windows/plugins/win_dhcp_pools.bat +++ b/agents/windows/plugins/win_dhcp_pools.bat @@ -1,3 +1,3 @@ @echo off echo ^<^<^<win_dhcp_pools^>^>^> -netsh dhcp server show mibinfo | find /V ": dhcp." | find /V "DHCP-Serverversion wurde" | find /V "nicht richtig funktionieren." +netsh dhcp server show mibinfo | find /V ": dhcp." | find /V "DHCP-Serverversion wurde" | find /V "nicht richtig funktionieren." | find /V ": dhcp server show mibinfo."

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits