[icinga-checkins] icinga.org: New commits on branch dev/cgis

git at icinga.org git at icinga.org
Sat Nov 5 17:16:14 CET 2011


URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=03224af30f3daf547471dab051acc54856c7b208
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Sat Nov 5 17:14:22 2011 +0100

    classic ui: fixed search not returning all results, only first match (without * at the end) #844
    
    refs: #844
    
    Done a rewrite of the search part. If user is searching something and a host or service
    matches, then the status entry gets marked as a match. When statusdata gets displayed
    it only shows the matching one's. Added "search_matched" to both statusdata struct.
    
    The filter uses regular expressions. Following items get checked against search string:
    
    * Host
    ** Host Name
    ** Display Name
    ** Alias
    ** Address
    ** Address6
    
    * Service
    ** Description
    ** Display Name
    ** Host Name
    ** combination of hostname and service description "hostname servicedescription"
    
    If all of this fails it tries to find a hostgroup or servicegroup which has to match the
    exact search string. This is still the old behavior.

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=940cc62d363e57629848c28862db7ea31b2401c3
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Tue Nov 1 20:50:37 2011 +0100

    Revert "classic-ui: link to first unreachable host is drawn in pink in statusmap.cgi #1464"
    
    This reverts commit cdb62f8b1c92b9812da716af32fe1c1127dfd712.
    
    the bike shed problem

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=a29d240677173b042ee9095785af38becb9dd676
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Thu Oct 27 00:16:13 2011 +0200

    classic-ui: fixed wrong color in histogram and trends for unknown/unreachable #2042
    
    refs: #2024
    
    * color change to pink
    * also fixed the image for service trends (rectangle ecloses all bars)

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=cdb62f8b1c92b9812da716af32fe1c1127dfd712
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Wed Oct 26 22:46:37 2011 +0200

    classic-ui: link to first unreachable host is drawn in pink in statusmap.cgi #1464
    
    refs: #1464

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=5ca7db879e13d5b7e4d54acb91628dfbe69c2f5e
Merge: 1fc4e4b2e83bd5cc2991b4239ecc163610d0763b 7335e44a7500a2c6ca9744540a462d12d1d8bef0
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Wed Oct 26 22:20:02 2011 +0200

    Merge branch 'dev/cgis' into rbartels/cgi

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=1fc4e4b2e83bd5cc2991b4239ecc163610d0763b
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Wed Oct 26 22:10:56 2011 +0200

    classic-ui: fixed wrong output from status.cgi with option hostservicedetail #2019
    
    refs: #2019
    
    Thanks to stku

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=c1613965f20b8227e5795a96570f318fc03773fe
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 25 17:41:32 2011 +0200

    reflag as 1.6.0-dev for testers and users

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=898c01981f31f556b0a1865e64a078b8a4569629
Merge: 492c6ef845478df5f30fb2e69e2d16ae795b1540 39ac93a1e46bb3212cb795eb4380b64d455aef63
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 25 17:38:58 2011 +0200

    Merge branch 'r1.6'
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=39ac93a1e46bb3212cb795eb4380b64d455aef63
Merge: bf32a6844784765adf689150f9ff86abfa9393ca c5da894102a8660487bee83d513568555c4644ad
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 25 13:32:38 2011 +0200

    Merge branch 'test/ido' into r1.6
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=c5da894102a8660487bee83d513568555c4644ad
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 25 13:20:38 2011 +0200

    beautify Changelog from ido branch changes

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=bf32a6844784765adf689150f9ff86abfa9393ca
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 25 12:31:48 2011 +0200

    update Changelog from previous commits, also CHANGES

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=2f557fc3b09181e665780f602ac52e5165cc617b
Merge: c7ffe03b3684e29fc10f7294c2a422a08613058c 92f0857dd5f26b42ef2893aa9aa00a8fd1b8a15b
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 25 12:17:20 2011 +0200

    Merge branch 'test/cgis' into r1.6
    
    Conflicts:
    	Changelog
    
    merge core and cgis changelog.

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=c7ffe03b3684e29fc10f7294c2a422a08613058c
Merge: 2ca922366f5bf9f2a1e0d9a73b1e906f3f5409db 730bc373ebe604bc6accc383d5668901488304de
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 25 12:10:39 2011 +0200

    Merge branch 'test/core' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=65025d00eef9da5dc24ae6d19eba277776bf43e9
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 24 20:14:26 2011 +0200

    * idoutils: add option to format debug log timestamp like locale %c (debug_readable_timestamp) #2033
    
    refs #2033

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=de95a762460cbeac42dc4e66142121c05603af9b
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 24 17:11:40 2011 +0200

    * core: indicate event loop start in logs #2036
    
    refs #2036

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=66d553b339b3271381caa9ea57762ab4c7d193df
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 24 19:39:43 2011 +0200

    * ido2db move all logging functions to logging.c/.h
    
    first step to a generalized logging
    
    refs #2031

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=1102f785e7a4b7a72df8fb4e5268af7fa660e92f
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 24 19:13:13 2011 +0200

    Revert "config changes from previous commit"
    
    This reverts commit 135778f4e998cbf8048c09de1f6c7010471d2f52.

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=4b1b5f815c1fb3867ad78dce3c432841abfb492e
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 24 19:05:14 2011 +0200

    unstable, no performance win. Revert "idoutils: add threaded circular buffer to ido2db, same as idomod #1259"
    
    This reverts commit b4195603a2f0671744e07f27b7abe93326de2f70.
    
    Conflicts:
    
    	module/idoutils/src/idomod.c

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=730bc373ebe604bc6accc383d5668901488304de
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 14:36:33 2011 +0200

    * core: plug memory leak in downtimes comment add (Dorian Guillois) #1979
    
    refs #1979

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=2996a8a560922a9b2885c5eaf50d9d9196902e49
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 14:31:48 2011 +0200

    fix host ack comments delete with wrong loop pointers causing segfauls #1979
    
    refs #1979

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=b93a4793ab05be7118544869a68436d92d75000d
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 13:52:27 2011 +0200

    reflect 1.6.0 in Changelog

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=d413f655cc8a669c54f661c03710af90b578054c
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 13:51:51 2011 +0200

    update working tree to 1.6.0

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=94f2ff09840f3a498336aea54faee2ae449408fa
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 13:51:04 2011 +0200

    update schema version to 1.6.0

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=2ef1411ed1f61399d80d7b4cb2466f1fdd63a025
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 13:48:36 2011 +0200

    * idoutils: add Indices for notification queries for Icinga Web #1964
    
    refs #1964

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=365574b33c89d955b4a5b5fe21196c1b51d3ac6f
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Oct 21 20:33:38 2011 +0200

    * core: reduce notification load by moving notification viability check into notification list creation #1744 ; fix $NOTIFICATIONRECIPIENTS$ macro contains all contacts assigned to host|service, not only notified contacts #2023
    
    two in one. please check the dev tracker issues
    for a deeper analysis.
    
    https://dev.icinga.org/issues/1744
    https://dev.icinga.org/issues/2023
    
    kudos to Opsview Team for their initial patch, now reworked
    against local macros, added inline comments to the code too.
    
    refs #1744
    refs #2023

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=534ee7f2d9575af1b8f50efa5652bf3310292faa
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 14:25:47 2011 +0200

    Revert "* idoutils: idomod: change output_buffer to asynchrounous circular buffer between core and data sink, removing core blocking #1259"
    
    This reverts commit a34a89917b28f537af17cd5d7c13d9ab924299a6.

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=35bc466285dd2f574115539b85ca446efb188b6e
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 14:25:00 2011 +0200

    Revert "idoutils: make idomod debug logging threadsafe with a mutex"
    
    This reverts commit 412e2203d3b163ff0a1ee15bf974fcef95b4b216.

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=1d8b1c5d20481547e039d126cfa6f10865f82e84
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 14:24:16 2011 +0200

    Revert "idoutils: move thread start + origcfg dump to new NEBTYPE_PROCESS_INITSTART and retained back to normal #1934, make logging threadsafe #1962, correct overflow log #1931"
    
    This reverts commit 9dfb19fb6491d87455bc1877d8c738ff6a5e7ced.
    
    Conflicts:
    
    	module/idoutils/src/idomod.c

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=33e5e5cfac7486a447130cf8e149b7e574bb5d5e
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 13:49:57 2011 +0200

    * idoutils: host state change last_hard_state overrides last_state, last_hard_state always -1 #1932
    
    funny bug ;-)
    
    refs #1932

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=ffa2c8a6084e41209b16324643d8b1124a202b30
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 13:13:40 2011 +0200

    * core: log error on non-existing host/service/contact/*group when sending a command to the core #1737
    
    this adds a bunch of logit functions into conditions
    which would just return a plain ERROR. there isn't a
    generic solution yet, so we need to handle that within
    each cmd function themselves.
    
    refs #1737

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=e1ed5c7242b9bbbb22f3939bad8cba9091acf5bc
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 11:27:39 2011 +0200

    * config: add config examples for local monitoring - check_procs for ido2db #1870
    
    fixes #1870

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=1253cb63927412e04cbf0d391c0272af6eeeab9f
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 10:36:39 2011 +0200

    * core: allow startup with no hosts/services/contacts defined, only warn #2015
    
    fixes #2015

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=84e4ee6b76f04e44687fbc3fd00d3015cb5a020f
Merge: 135778f4e998cbf8048c09de1f6c7010471d2f52 c0a5575d34f82e6d64a7cde4c29a125219749f4d
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 20 09:47:42 2011 +0200

    Merge branch 'gbeutner/sla-test' into dev/ido

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=dff57889b233f2bd22cdefcb6a3629f1145f01a2
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Oct 6 16:45:38 2011 +0200

    core: fix downtime and comments delete with wrong loop pointers causing segfaults #1979
    
    refs #1979

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=492c6ef845478df5f30fb2e69e2d16ae795b1540
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 4 15:03:19 2011 +0200

    update changelog targetting 1.6.0

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=2ca922366f5bf9f2a1e0d9a73b1e906f3f5409db
Merge: 1b9af59c736e923c1a5cb0145444baf7d62a0988 1a516153b6ce8ba619908e238e6198f8626e6437
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 4 15:01:43 2011 +0200

    Merge branch 'test/cgis' into r1.6
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=1b9af59c736e923c1a5cb0145444baf7d62a0988
Merge: de059809dd2ad2f256cd09ce18163272b45354a1 06187dc16e9d55b363180a556b2588254ac49aae
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 4 15:00:01 2011 +0200

    Merge branch 'test/core' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=06e7e7812de11fd9c944df63d2849b4b9a37cf0d
Merge: e24b3581a481c4ab9a4b9cdc6088b8d12890e1c8 1a516153b6ce8ba619908e238e6198f8626e6437
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 4 14:58:29 2011 +0200

    Merge branch 'test/cgis'
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=e24b3581a481c4ab9a4b9cdc6088b8d12890e1c8
Merge: d581464e574e9bdfb27e6c4f4a2c9e7202fbd92a 06187dc16e9d55b363180a556b2588254ac49aae
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 4 14:57:14 2011 +0200

    Merge branch 'test/core'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=de059809dd2ad2f256cd09ce18163272b45354a1
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Oct 4 14:56:45 2011 +0200

    flag as 1.6.0

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=135778f4e998cbf8048c09de1f6c7010471d2f52
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Sep 28 01:42:09 2011 +0200

    config changes from previous commit

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=b4195603a2f0671744e07f27b7abe93326de2f70
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Sep 28 01:30:19 2011 +0200

    idoutils: add threaded circular buffer to ido2db, same as idomod #1259
    
    main problem - the overall dump is now not synchronous but asynchronous.
    this requires finetuning on both sides, but the overall core blocking
    seems to be removed all over.
    
    furthermore, making all functions thread safe will be needed.
    and ido2db code needs to be cleaned from the old attempts.
    
    and, there souldn't be retries on the buffer if full anymore,
    the 2 buffers should just get into blocking mode.
    
    refs #1259

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=9dfb19fb6491d87455bc1877d8c738ff6a5e7ced
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Sep 27 20:31:10 2011 +0200

    idoutils: move thread start + origcfg dump to new NEBTYPE_PROCESS_INITSTART and retained back to normal #1934, make logging threadsafe #1962, correct overflow log #1931
    
    this changes the thread not to be started in event loop (new neb type making it happen sooner).
    the original config gets dumped immediately, but after daemonizing too, which NEBTYPE_PROCESS_INITSTART
    indicates for now. the retained config dump stays where it happened, the target in timeline is perfectly
    fine when using a circular buffer to cache these things.
    while the consumer queue thread is reading and dumping the configs to the database, the core can start
    the event loop, pushing status updates and current checks to the queue as well.
    
    the main disadvantage on a non-blocking neb module will be the buffer holding the data and needing
    the exact same time as the core was blocked to finally dump the whole config stuff. so this remains still
    in testing mode, and needs possible enhancements, basically on the sleep time of the threads and so on.
    
    the debug logging not being threadsafe was being fixed with the previous commit, holding a file pointer
    and writing simultanously to it is not really a good idea. the main logging functions used a core internal
    function which would invoke a neb callback to self() if something gets written to the icinga log file.
    this has been removed for now, the syslog will be used like done in ido2db, further logging must be done
    side by side with the demanded ido2db logging and their syslog facilities.
    previously, the newly added warning on the buffer overflow when the retry was hit, resulted in a segfault
    therefore this fix was done urgent.
    
    refs #1931
    refs #1934
    refs #1962

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=412e2203d3b163ff0a1ee15bf974fcef95b4b216
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Sep 27 17:56:09 2011 +0200

    idoutils: make idomod debug logging threadsafe with a mutex
    
    refs #1259

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=c0a5575d34f82e6d64a7cde4c29a125219749f4d
Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Tue Sep 27 13:00:07 2011 +0200

    SLA functionality (keeps a history of service and host availability).

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=8ce39951032efb7269bbb7a17e16861cfe5cd68f
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Sep 26 18:02:03 2011 +0200

    idoutils: fix # of drivers available if -1 (should be 0)

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=79e28436b2b351e4be44f8d06953ac02a499b1c0
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Sep 25 18:04:31 2011 +0200

    * core: add icinga startup delay checks to example configs, including perfdata  #1937
    
    refs #1937

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=a34a89917b28f537af17cd5d7c13d9ab924299a6
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Sep 25 02:08:49 2011 +0200

    * idoutils: idomod: change output_buffer to asynchrounous circular buffer between core and data sink, removing core blocking #1259
    
    ** main thread writes circular buffer, protected by a mutex
    ** client thread is started after event loop is starting, reading from circular buffer
    ** the config dump starts when the event loop starts, minimizing the overall startup delay
    ** on event loop start, idomod will now tell how many items to flush - please adjust this value in idomod.cfg accordinly
    ** default minimal output_buffer_items is now 50000 (see idomod.cfg)
    ** core blocking is removed, even if the database backend is slow / ido2db not responding
    
    for more please read https://dev.icinga.org/issues/1259
    
    refs #1259
    refs #866

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=06187dc16e9d55b363180a556b2588254ac49aae
Merge: a125426498296b6077477596309340b45a1360d4 3eef91f844fa7fb98fa5a56d0c237e842beec7b7
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Sep 16 18:44:07 2011 +0200

    Merge branch 'mfriedrich/core' of git.icinga.org:icinga-core into mfriedrich/core

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=a125426498296b6077477596309340b45a1360d4
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Sep 16 18:42:36 2011 +0200

    idoutils: added end_time column for acknowledgelemts expiry #770
    
    please check the issue itsself for further information.
    https://dev.icinga.org/issues/770
    
    this step is required in order to give the icinga-web team some time
    to implement that too.
    
    refs #770

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=afa283570c333ff2970afcf98496a502dffa767e
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Tue Sep 13 19:25:46 2011 +0200

    fixed last commit for expiring downtime. #770
    
    refs: #770
    
    * typo
    * change statusdata and objectdata sctruct, added value at the end now.

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=55c200f24ea790d78f891de85eb35b9857f087f1
Author: Ricardo Bartels <ricardo at bitchbrothers.com>
Date:   Mon Sep 12 22:25:52 2011 +0200

    Added the ability for acknowledgements to expire #770
    
    Refs: #770
    
    You can set a date (option) in the Classic-UI when the acknowledgment expires.
    After the expire date Icinga removes the acknowledgement itself. The date the
    acknowledgement expires is added to the comment.
    
    * Added 2 new COMMANDS:
      * CMD_ACKNOWLEDGE_HOST_PROBLEM_EXPIRE    174
      * CMD_ACKNOWLEDGE_SVC_PROBLEM_EXPIRE     175
    * Added function "broker_acknowledgement_data_expire" with added expire timestamp
      Function "broker_acknowledgement_data" still exists and is working
    * Added new attribute "end_time" at the end of "nebstruct_acknowledgement_data"
    * Added new event to event loop "EVENT_EXPIRE_ACKNOWLEDGEMENT"
    * Added acknowledgement_end_time to host and service data in status and retention file
    * Added a cgi config option "default_expiering_acknowledgement_duration"

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=d581464e574e9bdfb27e6c4f4a2c9e7202fbd92a
Merge: 9b2c38547014337b597d9fd76867c1f0608bd739 3eef91f844fa7fb98fa5a56d0c237e842beec7b7
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Sep 12 12:29:58 2011 +0200

    Merge branch 'mfriedrich/core'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=3eef91f844fa7fb98fa5a56d0c237e842beec7b7
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Sep 9 13:46:59 2011 +0200

    idoutils: fix idomod should log more verbose on errors, asking for a running ido2db process #1885
    
    fixes #1885

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=9b2c38547014337b597d9fd76867c1f0608bd739
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Aug 25 11:28:11 2011 +0200

    flag master as 1.6.0-dev and proposed release date

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=7adc93a9556c43936ef4577990655350a5f39c1f
Merge: ae712bb1a1c715e2153ecad7b079d597eeae6122 9f5a5ec7069eef63aab00d477eb16b0b13d48664
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Aug 25 11:23:17 2011 +0200

    Merge branch 'r1.5'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=ae712bb1a1c715e2153ecad7b079d597eeae6122
Merge: 499f581650b02921c69d9c13f50448dabc3c732b cde5f95a7f49df06a150a6fc0859eec19f597a35
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Aug 23 09:59:13 2011 +0200

    Merge branch 'r1.5'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=499f581650b02921c69d9c13f50448dabc3c732b
Merge: af1a236ed1adc5d7e13784301f4565191e345d61 262c72812289e44e6cc41cc51486f96bf3ccb1ac
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Aug 22 16:27:02 2011 +0200

    Merge branch 'r1.5'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=af1a236ed1adc5d7e13784301f4565191e345d61
Merge: a7f6b37a666874afaa54c2f93c25b9287c2480d0 5e285cf88f79879dd2710465b654eafcc8ee81d7
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Aug 9 18:10:24 2011 +0200

    Merge branch 'r1.5'
    
    Conflicts:
    	html/main.html
    	include/common.h
    	module/idoutils/include/ido2db.h

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=a7f6b37a666874afaa54c2f93c25b9287c2480d0
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Aug 9 18:08:54 2011 +0200

    now flag this version pre merge for final target release date

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=dfd00967b84e085eeb14a465219fbb516d23b6e1
Merge: 52d1bba13dfd4c6927f6cf68d4b48dcf8e49c4ea f0db23885e3f1cbacc52d601d89287ec788b63f5
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Aug 6 21:56:16 2011 +0200

    Merge branch 'r1.5'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=52d1bba13dfd4c6927f6cf68d4b48dcf8e49c4ea
Merge: ddb02784ca6eaf6e4ad92660318440cbcb8e1b6c 9091cb001ded41cf46ce7a8a402d2cd22157fde3
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Aug 6 20:49:42 2011 +0200

    Merge branch 'r1.5'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=ddb02784ca6eaf6e4ad92660318440cbcb8e1b6c
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Aug 3 20:43:20 2011 +0200

    merge pre final stage for 1.5.0 and flag as 1.5.0-dev $today

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=c6fd965d23fcf752a0c0859247e3a2472bd13a3e
Merge: 663b4c6340e181cd10169af78c9a02b34fac59bd c22fc22fc8f647b4427fce331da4976b342979f6
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Aug 3 20:42:50 2011 +0200

    Merge branch 'r1.5'

URL:    https://git.icinga.org/?p=icinga-core.git/commit/?id=663b4c6340e181cd10169af78c9a02b34fac59bd
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jul 29 17:24:56 2011 +0200

    merge master with r1.5 and flag as 1.5.0-dev $today





More information about the icinga-checkins mailing list