Module: check_mk
Branch: master
Commit: 9be64ca62837d6c28408e643956e35be9b01e671
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9be64ca62837d6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 9 12:05:20 2015 +0200
#2326 Allow relating Event Console hosts to monitoring hosts now also by alias
In the view of the Event Console events in the GUI Check_MK tries to match the
hosts of the events with the hosts in the monitoring (if they are known) by
either the host name or the IP address. From now on also the hosts' aliases
are being checked.
---
.werks/2326 | 12 ++++++++++++
ChangeLog | 1 +
mkeventd/web/plugins/views/mkeventd.py | 15 +++++++++++----
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/.werks/2326 b/.werks/2326
new file mode 100644
index 0000000..f634427
--- /dev/null
+++ b/.werks/2326
@@ -0,0 +1,12 @@
+Title: Allow relating Event Console hosts to monitoring hosts now also by alias
+Level: 1
+Component: ec
+Compatible: compat
+Version: 1.2.7i2
+Date: 1433844223
+Class: feature
+
+In the view of the Event Console events in the GUI Check_MK tries to match the
+hosts of the events with the hosts in the monitoring (if they are known) by
+either the host name or the IP address. From now on also the hosts' aliases
+are being checked.
diff --git a/ChangeLog b/ChangeLog
index b28d9be..98a253e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@
Event Console:
* 2333 The Event Console log level can now be configured via GUI...
* 2334 Logging details about loaded SNMP MIB modules during startup
+ * 2326 Allow relating Event Console hosts to monitoring hosts now also by alias...
1.2.7i1:
diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py
index 7afca6c..37f9e39 100644
--- a/mkeventd/web/plugins/views/mkeventd.py
+++ b/mkeventd/web/plugins/views/mkeventd.py
@@ -72,16 +72,21 @@ def table_events(what, columns, add_headers, only_sites, limit, filters):
# the host_address.
host_filters = ""
for host in required_hosts:
+ host_utf8 = host.encode("utf-8")
host_filters += "Filter: host_name =~ %s\n" \
- "Filter: host_address = %s\n" % (host.encode("utf-8"), host.encode("utf-8"))
+ "Filter: host_alias =~ %s\n" \
+ "Filter: host_address = %s\n" % \
+ (host_utf8, host_utf8, host_utf8)
if len(required_hosts) > 0:
- host_filters += "Or: %d\n" % (len(required_hosts) * 2)
+ host_filters += "Or: %d\n" % (len(required_hosts) * 3)
# Make sure that the host name is fetched. We need it for
# joining. The event columns are always fetched all. The event
# daemon currently does not implement any Columns: header.
if "host_name" not in columns:
columns.append("host_name")
+ if "host_alias" not in columns:
+ columns.append("host_alias")
if "host_address" not in columns:
columns.append("host_address")
@@ -124,11 +129,12 @@ def table_events(what, columns, add_headers, only_sites, limit, filters):
else:
host_contact_groups = None
- # Create lookup dict from hostname/address to the dataset of the host.
+ # Create lookup dict from hostname/alias/address to the dataset of the host.
# This speeds up the mapping to the events.
hostdict = {}
for row in hostrows:
hostdict[row["host_name"].lower()] = row
+ hostdict[row["host_alias"].lower()] = row
hostdict[row["host_address"]] = row
# If there is at least one host filter, then we do not show event
@@ -928,7 +934,8 @@ if mkeventd_enabled:
('event_state', None, ''),
('event_host', None, ''),
('event_ipaddress', None, ''),
- ('host_address', 'hoststatus', ''),
+ ('foobar', None, ''),
+ ('alias', 'hoststatus', ''),
('host_contacts', None, ''),
('host_icons', None, ''),
('event_text', None, ''),
Module: check_mk
Branch: master
Commit: aa1ed3dfbf1a9f0b128085d38d1188110cd28806
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1ed3dfbf1a9f…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Jun 9 10:52:15 2015 +0200
#1256 lvm_vgs: Check now has his own configuration in wato
Before the filesystem rulset was used. If you already created parameters for this check you have the recreate this parameters in the new rule.
---
.werks/1256 | 10 +++++
ChangeLog | 2 +
checks/lvm_vgs | 2 +-
web/plugins/wato/check_parameters.py | 73 ++++++++++++++++++++++++++++++++++
4 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/.werks/1256 b/.werks/1256
new file mode 100644
index 0000000..833698d
--- /dev/null
+++ b/.werks/1256
@@ -0,0 +1,10 @@
+Title: lvm_vgs: Check now has his own configuration in wato
+Level: 1
+Component: wato
+Compatible: incomp
+Version: 1.2.7i2
+Date: 1433839820
+Class: feature
+
+Before the filesystem rulset was used. If you already created parameters for this check you have the recreate this parameters in the new rule.
+
diff --git a/ChangeLog b/ChangeLog
index 2a6a890..ab5bef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
WATO:
* 1254 The target address for crash reports can now be configured in wato global settings
+ * 1256 lvm_vgs: Check now has his own configuration in wato...
+ NOTE: Please refer to the migration notes!
BI:
* 2336 FIX: BI compilation diagnostics are now logged to the generic web.log...
diff --git a/checks/lvm_vgs b/checks/lvm_vgs
index 38c9c67..f2aa383 100644
--- a/checks/lvm_vgs
+++ b/checks/lvm_vgs
@@ -42,6 +42,6 @@ check_info['lvm_vgs'] = {
"inventory_function" : inventory_lvm_vgs,
"service_description" : "LVM VG %s",
"has_perfdata" : True,
- "group" : "filesystem",
+ "group" : "volume_groups",
"default_levels_variable" : "filesystem_default_levels",
}
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 244dad2..2803fe5 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -2604,6 +2604,79 @@ register_check_parameters(
register_check_parameters(
subgroup_storage,
+ "volume_groups",
+ _("Volume Groups (LVM)"),
+ Dictionary(
+ elements = [
+ ("levels",
+ Alternative(
+ title = _("Levels for volume group"),
+ show_alternative_title = True,
+ default_value = (80.0, 90.0),
+ match = match_dual_level_type,
+ elements = [
+ get_free_used_dynamic_valuespec("used", "volume group"),
+ Transform(
+ get_free_used_dynamic_valuespec("free", "filesystem", default_value = (20.0, 10.0)),
+ title = _("Levels for free space"),
+ allow_empty = False,
+ forth = transform_filesystem_free,
+ back = transform_filesystem_free
+ )
+ ]
+ )
+ ),
+ # Beware: this is a nasty hack that helps us to detect new-style paramters.
+ # Something hat has todo with float/int conversion and has not been documented
+ # by the one who implemented this.
+ ( "flex_levels",
+ FixedValue(
+ None,
+ totext = "",
+ title = "",
+ )),
+ ( "show_levels",
+ DropdownChoice(
+ title = _("Display warn/crit levels in check output..."),
+ choices = [
+ ( "onproblem", _("Only if the status is non-OK")),
+ ( "onmagic", _("If the status is non-OK or a magic factor is set")),
+ ( "always", _("Always") ),
+ ],
+ default_value = "onmagic",
+ )),
+ ( "magic",
+ Float(
+ title = _("Magic factor (automatic level adaptation for large volume groups)"),
+ default_value = 0.8,
+ minvalue = 0.1,
+ maxvalue = 1.0)),
+ ( "magic_normsize",
+ Integer(
+ title = _("Reference size for magic factor"),
+ default_value = 20,
+ minvalue = 1,
+ unit = _("GB"))),
+ ( "levels_low",
+ Tuple(
+ title = _("Minimum levels if using magic factor"),
+ help = _("The levels will never fall below these values, when using "
+ "the magic factor and the volume group is very small."),
+ elements = [
+ Percentage(title = _("Warning at"), unit = _("% usage"), allow_int = True, default_value=50),
+ Percentage(title = _("Critical at"), unit = _("% usage"), allow_int = True, default_value=60)])),
+
+ ],
+ hidden_keys = ["flex_levels"],
+ ),
+ TextAscii(
+ title = _("Volume Group"),
+ allow_empty = False),
+ "dict"
+)
+
+register_check_parameters(
+ subgroup_storage,
"ibm_svc_mdiskgrp",
_("IBM SVC Pool Capacity"),
Dictionary(
Module: check_mk
Branch: master
Commit: c1963977a32d4f11c81a9a4929059f284efc3fbf
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1963977a32d4f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Jun 9 10:20:27 2015 +0200
#2307 FIX: Windows Agent MSI installer: removed version information from product name
---
.werks/2306 | 10 ++++++++++
.werks/2307 | 12 ++++++++++++
ChangeLog | 2 +-
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 301568 -> 301568 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 301568 -> 301568 bytes
agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes
agents/windows/check_mk_agent.msi | Bin 734208 -> 734208 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes
agents/windows/crash.exe | Bin 20024 -> 20024 bytes
agents/windows/install_agent-64.exe | Bin 178941 -> 178942 bytes
agents/windows/install_agent.exe | Bin 159862 -> 159862 bytes
agents/windows/msibuild/msi-update | 2 +-
agents/windows/nowin.exe | Bin 22511 -> 22511 bytes
14 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/.werks/2306 b/.werks/2306
new file mode 100644
index 0000000..437209d
--- /dev/null
+++ b/.werks/2306
@@ -0,0 +1,10 @@
+Title: windows agent: made 32 bit version working again (used old 32 bit crosscompiler)
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i1p2
+Date: 1433834306
+Class: fix
+
+Introducing a new crosscompiler for the 32 bit version broke a few things - the agent crashed..
+With this werk the old crosscompiler is used again.
diff --git a/.werks/2307 b/.werks/2307
new file mode 100644
index 0000000..0497cf0
--- /dev/null
+++ b/.werks/2307
@@ -0,0 +1,12 @@
+Title: Windows Agent MSI installer: removed version information from product name
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i2
+Date: 1433835402
+
+The agent version is no longer displayed in the product name.
+This is because some software management tools have troubles to detect the same
+product family if the name differs.
diff --git a/ChangeLog b/ChangeLog
index 38e0e59..a954f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.2.7i2:
Core & Setup:
* 2339 FIX: Discovery service: Fixed handling of agent / SNMP communication errors...
+ * 2307 FIX: Windows Agent MSI installer: removed version information from product name...
Checks & Agents:
* 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well
@@ -14,7 +15,6 @@
* 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions...
* 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices
* 2217 FIX: md: Fix handling of found and expected disks
- * 2306 FIX: windows agent: made 32 bit version working again (used old 32 bit crosscompiler)...
Multisite:
* 2260 Improved load time of Check_MK GUI...
diff --git a/agents/windows/build_version b/agents/windows/build_version
index b34c321..f07e286 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-171
+175
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 3e7f98b..ede8c61 100755
Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe
index 95e2381..ecd9866 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index 3435213..27f1f02 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ
diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi
index 117e44c..faccffc 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe
index 358a053..e2b1594 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe
index de363b2..7d93369 100755
Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 53bd16c..cf1d178 100755
Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 7d7a4a0..fbc2fe1 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ
diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update
index 993309c..2da2e51 100755
--- a/agents/windows/msibuild/msi-update
+++ b/agents/windows/msibuild/msi-update
@@ -160,7 +160,7 @@ try:
for line in lines_property_idt[3:]:
tokens = line.split("\t")
if tokens[0] == "ProductName":
- tokens[1] = "Check_MK Agent MSI %s Rev %s\r\n" % (new_version_name, new_version_build.split(".")[-1])
+ tokens[1] = "Check_MK Agent\r\n"
# The upgrade code defines the product family. Do not change it!
# elif tokens[0] == "UpgradeCode":
# tokens[1] = upgrade_code
diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe
index 1762fbf..f7242cb 100755
Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ
Module: check_mk
Branch: master
Commit: 0e9e4398e3e0a6f7f3d062c5c063cb399c4a02f8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e9e4398e3e0a6…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Jun 9 09:54:47 2015 +0200
#1255 AIX Agent now supports fileinfo. Thanks to Falk Grunert (IBM)
---
.werks/1255 | 9 +++++++++
ChangeLog | 2 +-
agents/check_mk_agent.aix | 7 +++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/.werks/1255 b/.werks/1255
new file mode 100644
index 0000000..eda6779
--- /dev/null
+++ b/.werks/1255
@@ -0,0 +1,9 @@
+Title: AIX Agent now supports fileinfo. Thanks to Falk Grunert (IBM)
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i2
+Date: 1433836441
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 38e0e59..2a6a890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,12 +9,12 @@
* 2119 omd_status: check can now work in a cluster environment
* 2219 hr_cpu: Reworked check to use WATO rule allowing averaging and predictive levels...
NOTE: Please refer to the migration notes!
+ * 1255 AIX Agent now supports fileinfo. Thanks to Falk Grunert (IBM)
* 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information
* 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon...
* 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions...
* 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices
* 2217 FIX: md: Fix handling of found and expected disks
- * 2306 FIX: windows agent: made 32 bit version working again (used old 32 bit crosscompiler)...
Multisite:
* 2260 Improved load time of Check_MK GUI...
diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix
index bb886b9..e7b8b48 100755
--- a/agents/check_mk_agent.aix
+++ b/agents/check_mk_agent.aix
@@ -238,6 +238,13 @@ then
done
fi
+# Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg
+if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then
+ echo '<<<fileinfo:sep(124)>>>'
+ date +%s
+ # simulate output of the Linux "stat -c "%n|%s|%Y" command
+ /usr/bin/perl -e 'printf "$_|%s|%s\n", (stat) [7,9] for @ARGV' $(cat "$MK_CONFDIR/fileinfo.cfg")
+fi
echo '<<<local>>>'
if cd $LOCALDIR 2>/dev/null