Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 31, 2015
  1. @olivierHa

    update changelog

    olivierHa authored
  2. @olivierHa

    Merge pull request #1708 from geektophe/fix_tmpl_foreach_same_host_an…

    olivierHa authored
    …d_name
    
    Fix: duplicate service from template with same name
  3. @geektophe

    Merge remote-tracking branch 'upstream/master' into fix_tmpl_foreach_…

    geektophe authored
    …same_host_and_name
    
    Conflicts:
    	shinken/objects/service.py
  4. @olivierHa

    update changelog

    olivierHa authored
  5. @olivierHa

    Merge pull request #1711 from geektophe/enh_inital_state_implementation

    olivierHa authored
    Enh: implemented initial_state management
  6. change killmode

    dhannequin authored
Commits on Aug 29, 2015
  1. @geektophe

    Enh: implemented initial_state management

    geektophe authored
    This patch adds management of the `initial_state` attribute on hosts and
    services.
    
    This attribute was available as an host or service attribute, but no
    code behind took it into account.
    
    An host or service initial state default value is still `PENDING`, but
    it may be overridden for a specific host or service by setting its
    `initial_state`. The initial output may also be configured via the
    `initial_output` attribute.
    
    Examples:
    
    define host{
        use                          generic-host
        host_name                    test_host_0
        address                      127.0.0.1
        initial_state                u
        initial_output               Waiting for status
    }
    
    define service {
      use                            generic-service
      host_name                      test_host_0
      service_description            test_service_0
      initial_state                  o
      initial_output                 Waiting for status
    }
    
    **Caution**: the initial state of hosts or services are configured at
    configuration parse level, but they may be overwritten by the scheduler
    when the retention data is loaded if a previous state has been saved.
Commits on Aug 28, 2015
  1. @olivierHa

    Changelog update

    olivierHa authored
  2. @olivierHa

    Merge pull request #1706 from geektophe/enh_excr_ovr_expand_expr

    olivierHa authored
    Service excludes/includes/overrides extension
  3. @olivierHa

    Merge pull request #1709 from geektophe/enh_gitignore_extension

    olivierHa authored
    Added some more git ignored patterns
  4. @geektophe
  5. @geektophe

    Pep8 compliance

    geektophe authored
Commits on Aug 27, 2015
  1. @geektophe

    Fix: duplicate service from tmp with same name

    geektophe authored
    This patch fixes a regression appearing when services are generated with
    a `duplicate_foreach` statement from a common host template, and where
    description differs only by the expanded value of $KEY$ macro.
    
    In such a situation, only the lastly defined host would have its
    services generated.
    
    Example:
    
        define host{
          ...
          host_name                      test_host
          use                            generic-host
          register                       0
        }
    
        define host{
          use                            test_host
          host_name                      test_host_1
          _sdescr1                       svc1, svc2
        }
    
        define host{
          use                            test_host
          host_name                      test_host_2
          _sdescr2                       svc3, svc4
        }
    
        define service{
          ...
          host_name                      test_host
          service_description            $KEY$
          servicegroups                  servicegroup_01,ok
          use                            generic-service
          check_command                  command1
          duplicate_foreach		 _sdescr1
          register                       0
        }
    
        define service{
          ...
          host_name                      test_host
          service_description            $KEY$
          servicegroups                  servicegroup_01,ok
          use                            generic-service
          duplicate_foreach		 _sdescr2
          check_command                  command2
          register                       0
        }
    
    In the previous example, only half the services would have been generated.
  2. @geektophe

    Service excludes/includes/overrides extension

    geektophe authored
    This patch extends the service excludes/includes/overrides feature by
    allowing to select target services in `service_excludes`,
    `service_excludes` and `service_overrides` host attribute
    using `*` (meaning all services attached to the host), or using a regular
    expression (using the `r:` prefix) on the host's services
    `service_description` attribute.
    
    Examples:
    
        define host {
            ...
            host_name test
            service_excludes *
            ....
        }
    
    This example would exclude all services from host `test`.
    
        define host {
            ...
            host_name test
            service_excludes r:^proc
            ....
        }
    
    This example would exclude all services from host `test` which
    `service_description` starts by `proc`.
    
        define host {
            ...
            host_name test
            service_overrides *,notification_period workhours
            ....
        }
    
    This example would enforce `notification_period` to `workhours` on all
    services from host `test`.
    
        define host {
            ...
            host_name test
            service_overrides r:^proc,notification_period workhours
            ....
        }
    
    This example would enforce `notification_period` to `workhours` on all
    services from host `test` which `service_description` starts by `proc`..
    
    **Caution**: regular expressions are case sensitive, and a regular
    expression which is matched by none of the services on the host would
    still raise an error.
Commits on Aug 25, 2015
  1. @olivierHa

    Merge pull request #1703 from geektophe/fix_tmpl_service_excludes

    olivierHa authored
    Fix: service_(includes|excludes) tmpl recursion
  2. @geektophe

    Fixed service_(includes|excludes) tmpl recursion

    geektophe authored
    Fixed a regression introduced in
    9f9bc20
    
    If an attrubute covered by a property is explicitely set at class or
    instance level (during initialization for example), it breaks
    attribute's template recursion in `get_property_by_inheritance` on
    `if hasattr(self, prop)` (attributes is always seen as affected, even if
    it was never set).
    
    In the present case, it broke service exclusion defined on templates
    rather than host.
Commits on Aug 14, 2015
  1. @olivierHa
  2. @olivierHa
  3. @olivierHa
  4. @olivierHa
Commits on Jul 24, 2015
  1. add KillMode for all systemd daemon

    dhannequin authored
Commits on Jul 22, 2015
  1. add KillMode for systemd

    dhannequin authored
Commits on Jul 15, 2015
  1. Fix: cpu looping for receiver

    authored
  2. Fix: manage conflicts

    authored
Commits on Jul 13, 2015
  1. @claneys

    Merge pull request #1653 from naparuba/shinken_notification

    claneys authored
    Shinken default notification plugin
Commits on Jul 12, 2015
  1. @olivierHa

    Merge pull request #1674 from nslythe/master

    olivierHa authored
    Update service.rst
Commits on Jul 11, 2015
  1. @olivierHa

    Fix #1672

    olivierHa authored
  2. @olivierHa
Commits on Jul 10, 2015
  1. @nslythe

    Update service.rst

    nslythe authored
    Ther wa an errors in the duplicate_foreach section.
    We have to put a "$" at the end of the line and there is missing "," between each KEY
Commits on Jul 8, 2015
  1. @olivierHa

    Fix #1638

    olivierHa authored
Commits on Jul 7, 2015
  1. @olivierHa
Commits on Jun 29, 2015
  1. Merge pull request #1669 from Langlais115/patch-1

    authored
    Fix Windows path typo
  2. @Langlais115

    Fix Windows path typo

    Langlais115 authored
Commits on Jun 11, 2015
  1. Merge pull request #1658 from s-dewailly/master

    authored
    Correct hostescalation example
Something went wrong with that request. Please try again.