Module: check_mk
Branch: master
Commit: 27ebcfe6acaeb63a13ec8c7c7b1a223ab61e4199
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27ebcfe6acaeb6…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Apr 18 16:32:06 2017 +0200
4470 FIX Event console: fixed incorrect event counting for timed-out and heartbeat events
The internal event counter of status_num_open_events (and others) was not correctly decreased for
<ul>
<li>events with timeouts, e.g. an event with a lifetime</li>
<li>events which expect something in a given interval</li>
</ul>
Since this event count never decreased, the limits specified in the global settings rule <i>Limit amount of current events</i>,
were reached when the event console ran for a certain amount of time. A restart always fixed this problem, because these counts
are calculated from scratch during startup.
Change-Id: Iab41625af9619217c80751933e196d87b9dacbd2
---
.werks/4470 | 19 +++++++++++++++++++
bin/mkeventd | 5 +++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/.werks/4470 b/.werks/4470
new file mode 100644
index 0000000..b9f51d4
--- /dev/null
+++ b/.werks/4470
@@ -0,0 +1,19 @@
+Title: Event console: fixed incorrect event counting for timed-out and heartbeat events
+Level: 1
+Component: ec
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1492524907
+Class: fix
+
+The internal event counter of status_num_open_events (and others) was not correctly decreased for
+
+<ul>
+<li>events with timeouts, e.g. an event with a lifetime</li>
+<li>events which expect something in a given interval</li>
+</ul>
+
+Since this event count never decreased, the limits specified in the global settings rule <i>Limit amount of current events</i>,
+were reached when the event console ran for a certain amount of time. A restart always fixed this problem, because these counts
+are calculated from scratch during startup.
diff --git a/bin/mkeventd b/bin/mkeventd
index ace8a43..56f302d 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -1786,7 +1786,8 @@ class EventServer:
# Do delayed deletion now (was delayed in order to keep list indices OK)
for nr in events_to_delete[::-1]:
- del events[nr]
+ g_event_status.remove_event(events[nr])
+
def hk_check_expected_messages(self):
now = time.time()
@@ -1845,7 +1846,7 @@ class EventServer:
self.handle_absent_event(rule, 0, expected_count, interval_start)
for nr in events_to_delete[::1]:
- del events[nr]
+ g_event_status.remove_event(events[nr])
def handle_absent_event(self, rule, event_count, expected_count, interval_start):
Module: check_mk
Branch: master
Commit: 4aa87502b58800baf66e79d7d0dbca7ea350dbec
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aa87502b58800…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 18 15:10:17 2017 +0200
Updated werks
Change-Id: I535a28215cfd7f113cf7fc679fc0c16320f38fc9
---
.werks/2992 | 2 +-
.werks/3141 | 2 +-
.werks/3228 | 2 +-
.werks/3376 | 51 +++++++++++++++++++++++++++------------------------
.werks/3780 | 2 +-
.werks/3891 | 12 ++++++------
.werks/3971 | 4 ++--
.werks/3997 | 2 +-
.werks/4095 | 2 +-
.werks/4106 | 2 +-
.werks/4136 | 2 +-
.werks/4360 | 2 +-
.werks/4484 | 6 +++---
.werks/8360 | 2 +-
.werks/8547 | 2 +-
15 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/.werks/2992 b/.werks/2992
index e4d61fb..bc82b10 100644
--- a/.werks/2992
+++ b/.werks/2992
@@ -1,4 +1,4 @@
-Title: New visual filter: "Hostname or Alias"
+Title: New filter: "Hostname or Alias"
Level: 1
Component: multisite
Compatible: compat
diff --git a/.werks/3141 b/.werks/3141
index ea791d4..3761abf 100644
--- a/.werks/3141
+++ b/.werks/3141
@@ -1,6 +1,6 @@
Title: added user interfaces and permissions to view and acknowledge failed notifications
Level: 1
-Component: multisite
+Component: notifications
Compatible: compat
Version: 1.4.0i1
Date: 1465804883
diff --git a/.werks/3228 b/.werks/3228
index f9f4c5f..57268aa 100644
--- a/.werks/3228
+++ b/.werks/3228
@@ -1,6 +1,6 @@
Title: The BI Treestate painter now exports the aggregation tree as real json structure
Level: 1
-Component: multisite
+Component: bi
Compatible: compat
Version: 1.4.0i1
Date: 1456842643
diff --git a/.werks/3376 b/.werks/3376
index 9185701..257c98c 100644
--- a/.werks/3376
+++ b/.werks/3376
@@ -1,4 +1,4 @@
-Title: Cleaned up handling of setting Livestatus AuthUser for "see all" users
+Title: Better handling of host/service visibility of users with admin role
Level: 1
Component: multisite
Compatible: incomp
@@ -6,31 +6,34 @@ Version: 1.4.0i1
Date: 1460548346
Class: feature
-This change affects only users which have the "general.see_all" permission, normally Administrators
-and Guests. But the most affected users will be the admins.
+This change affects only users which have the "general.see_all" permission,
+normally Administrators and Guests. But the most affected users will be
+the admins.
-Previous Check_MK versions had the options "Visibility of Hosts/Services" and
-"Visibility of Hosts/Services (Webservice)" which could be set in the user profile. These options
-could be used by all users which have the "see all" permission to limit the shown hosts and services
-to only the ones which they are really a contact for.
+Previous Check_MK versions had the options {{Visibility of Hosts/Services}}
+and {{Visibility of Hosts/Services (Webservice)}} which could be set in
+the user profile. These options could be used by all users which have the
+"see all" permission to limit the shown hosts and services to only the ones
+which they are really a contact for.
-The later option has been deprecated now. It was first integrated to make users of external tools
-like Nagstamon, which fetches it's list of host and service problems from the Check_MK webservice,
-be able to show only the the problems of their hosts and services.
-But this option also had a side effect: When it is enabled and the option "Visibility of Hosts/Services"
-was not enabled, the admin could see all hosts/services in the GUI but when executing a CSV export
-he was only getting the hosts/services he is a contact for.
+The later option has been deprecated now. It was first integrated to make users
+of external tools like Nagstamon, which fetches it's list of host and service
+problems from the Check_MK webservice, be able to show only the the problems
+of their hosts and services. But this option also had a side effect: When
+it is enabled and the option {{Visibility of Hosts/Services}} was not enabled,
+the admin could see all hosts/services in the GUI but when executing a CSV
+export he was only getting the hosts/services he is a contact for.
-To fix this situation we decided to deprecate the "Visibility of Hosts/Services (Webservice)" and
-replace it with a URL variable which can be used to filter each page individually. The new URL
-variable <tt>force_authuser</tt> can be used on any view and set to:
+To fix this situation we decided to deprecate the {{Visibility of
+Hosts/Services (Webservice)}} and replace it with a URL variable which
+can be used to filter each page individually. The new URL variable
+<tt>force_authuser</tt> can be used on any view and set to:
-<ul>
- <li><tt>1<tt> to show only the hosts/services the user is a contact for</li>
- <li><tt>0<tt> to show all hosts/services</li>
- <li><tt>[username]<tt> to show all hosts/services the given user is a contact for</li>
-</ul>
+LI:L<tt>1<tt> to show only the hosts/services the user is a contact for
+LI:L<tt>0<tt> to show all hosts/services
+LI:L<tt>[username]<tt> to show all hosts/services the given user is a contact for
-The now deprecated option will still be working as before but you are recommended to uncheck
-the option and use the new mechanism. If you are using it for Nagstamon you will need to
-use a Nagstamon 2.0 release newer than ALPHA-20160307 once it is available.
+The now deprecated option will still be working as before but you are
+recommended to uncheck the option and use the new mechanism. If you are
+using it for Nagstamon you will need to use a Nagstamon 2.0 release newer
+than ALPHA-20160307 once it is available.
diff --git a/.werks/3780 b/.werks/3780
index ef79d9e..fec8c1a 100644
--- a/.werks/3780
+++ b/.werks/3780
@@ -1,6 +1,6 @@
Title: availability: now limit of fetched logfile rows is configurable.
Level: 1
-Component: multisite
+Component: reporting
Compatible: compat
Version: 1.4.0i1
Date: 1472111747
diff --git a/.werks/3891 b/.werks/3891
index 4e40ce3..e594c82 100644
--- a/.werks/3891
+++ b/.werks/3891
@@ -1,6 +1,6 @@
Title: Changed graph time range choices
Level: 1
-Component: multisite
+Component: metrics
Compatible: compat
Version: 1.4.0i1
Date: 1474636659
@@ -11,8 +11,8 @@ to have a little more context. We also extended the "month" and "year" time rang
You have now the following available:
-The last 4 hours
-The last 25 hours
-The last 8 days
-The last 35 days
-The last 400 days
+LI:The last 4 hours
+LI:The last 25 hours
+LI:The last 8 days
+LI:The last 35 days
+LI:The last 400 days
diff --git a/.werks/3971 b/.werks/3971
index 001994b..dc14000 100644
--- a/.werks/3971
+++ b/.werks/3971
@@ -6,5 +6,5 @@ Version: 1.4.0i2
Date: 1477490226
Class: feature
-In addition to the host and service states, the tactical overview is now showing numbers
-for the open events in the Event Console.
+In addition to the host and service states, the tactical overview is now
+showing numbers for the open events in the Event Console.
diff --git a/.werks/3997 b/.werks/3997
index b49eaef..c51e272 100644
--- a/.werks/3997
+++ b/.werks/3997
@@ -1,6 +1,6 @@
Title: New metric for mrpe/check_icmp
Level: 1
-Component: multisite
+Component: checks
Compatible: compat
Version: 1.4.0i3
Date: 1480521650
diff --git a/.werks/4095 b/.werks/4095
index 71087e0..c5a7da0 100644
--- a/.werks/4095
+++ b/.werks/4095
@@ -1,4 +1,4 @@
-Title: new filter host auxiliary tags
+Title: new filter: host auxiliary tags
Level: 1
Component: multisite
Compatible: compat
diff --git a/.werks/4106 b/.werks/4106
index 3534f67..446d915 100644
--- a/.werks/4106
+++ b/.werks/4106
@@ -1,4 +1,4 @@
-Title: new filter host/service-service-level
+Title: new filter: host/service-service-level
Level: 1
Component: multisite
Compatible: compat
diff --git a/.werks/4136 b/.werks/4136
index ba0c8f1..dbaef64 100644
--- a/.werks/4136
+++ b/.werks/4136
@@ -1,6 +1,6 @@
Title: Availability CSV export: Adding grouping title as first column in case of grouped views
Level: 1
-Component: multisite
+Component: reporting
Compatible: compat
Version: 1.4.0i3
Date: 1481189103
diff --git a/.werks/4360 b/.werks/4360
index e5bb492..0f2f197 100644
--- a/.werks/4360
+++ b/.werks/4360
@@ -1,6 +1,6 @@
Title: Availability: now percentage and time format can be choosen simultaneously in the availability option 'Format time ranges'
Level: 1
-Component: multisite
+Component: reporting
Compatible: compat
Version: 1.4.0b2
Date: 1487076950
diff --git a/.werks/4484 b/.werks/4484
index d8325c8..a41ddbf 100644
--- a/.werks/4484
+++ b/.werks/4484
@@ -1,11 +1,11 @@
-Title: Now time range previews can be enabled or disabled and default graph time range can be choosen in 'Service Graphs with Timerange previews'
+Title: Graph iime range previews can be disabled, default can be set
Level: 1
-Component: multisite
+Component: metrics
+Class: feature
Compatible: compat
Edition: cee
Version: 1.5.0i1
Date: 1488819450
-Class: feature
If you insert the 'Service Graphs with Timerange previews' column
then you're able to en- or disable time range previews. Moreover
diff --git a/.werks/8360 b/.werks/8360
index 44f0b83..ec501a0 100644
--- a/.werks/8360
+++ b/.werks/8360
@@ -1,7 +1,7 @@
Title: Recurring downtimes now for nth day of month and xth weekday from beginning and end
Level: 2
Edition: cee
-Component: multisite
+Component: core
Compatible: compat
Version: 1.2.7i4
Date: 1450723435
diff --git a/.werks/8547 b/.werks/8547
index 18ce0b6..82b774b 100644
--- a/.werks/8547
+++ b/.werks/8547
@@ -1,7 +1,7 @@
Title: Graph legend and controls can now be enabled/disabled through view display options
Level: 1
Edition: cee
-Component: multisite
+Component: metrics
Compatible: compat
Version: 1.4.0i1
Date: 1472562783
Module: check_mk
Branch: master
Commit: d909b6f0840775cad2dbc896892fba7cc173270c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d909b6f0840775…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 18 10:43:17 2017 +0200
Updated Werks
Change-Id: Iee7d5a77297f70cbe40bee6eb66e733ee9950161
---
.werks/3155 | 2 +-
.werks/3970 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.werks/3155 b/.werks/3155
index 1857a27..628253d 100644
--- a/.werks/3155
+++ b/.werks/3155
@@ -1,5 +1,5 @@
Title: implemented dual monitoring for systems with management boards (like HP iLO)
-Level: 1
+Level: 2
Component: core
Compatible: compat
Version: 1.4.0i1
diff --git a/.werks/3970 b/.werks/3970
index ba6b537..b34d820 100644
--- a/.werks/3970
+++ b/.werks/3970
@@ -13,6 +13,6 @@ as start URLs for their GUI.
An attacker could use this to make an authenticated GUI user open a page of his
choice when the user clicks on a prepared link.
-One example URL which could be used: "index.py?start_url=//heise.de".
+One example URL which could be used: <tt>index.py?start_url=//heise.de</tt>
Thanks to Marcel Bilal for reporting the issue!