Permalink
Commits on Dec 20, 2018
  1. Merge pull request #124 in MONITOR/merlin from bugfix/remove-unnecess…

    psharmaop5 committed Dec 20, 2018
    …ary-info-print to master
    
    * commit '2774615dee3d72ccb02cdfc3d9fecbcd32e432c7':
      Remove unnecessary info print
  2. Remove unnecessary info print

    jacobbaungard committed Dec 20, 2018
    The previous commit included a info print which was using for debugging
    during development. Unfortunently this was not removed prior to mergin,
    hence removing it here.
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
  3. Merge pull request #123 in MONITOR/merlin from bugfix/MON-11401-dupli…

    jacobbaungard committed Dec 20, 2018
    …cate-notifications to master
    
    * commit '9082dbea153dbe30968033be601ef5af82504a7b':
      Improve logic for custom notification handling
      Testcase for custom notification corrected
      Do not send duplicate notification from peers
Commits on Dec 12, 2018
  1. Improve logic for custom notification handling

    jacobbaungard committed Dec 11, 2018
    The logic for handling the custom notification external command had
    become a little hard to follow. Futher to this, the logic in place did
    not match the logic used for actually sending out notifications.
    
    The result of this was a mismatch, that could cause custom notifications
    to not be sent out correctly.
    
    This commit should address all of the above.
    
    Part of MON-11401
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Dec 11, 2018
  1. Testcase for custom notification corrected

    jacobbaungard committed Dec 10, 2018
    This commit fixes a previously erroneous testcase. The testcase should
    ensure that only one peer master sends out a custom notification.
    However the wrong host was defined in the test case (a host which that
    peer would not be resposible for).
    
    After the fix for MON-10239, this test case, would fail, due to the
    error above.
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
  2. Do not send duplicate notification from peers

    jacobbaungard committed Dec 10, 2018
    Follow the fix for MON-10239, we would have duplicate notifications sent
    from both peers, if pollers has notifies set to zero.
    
    This patch correctly ensures that only one of the masters sends out a
    notification.
    
    This fixes MON-11401
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
  3. Merge pull request #122 in MONITOR/merlin from feature/MON-11318-save…

    Erik Sjostrom
    Erik Sjostrom committed Dec 11, 2018
    …-hooks-in-nachos to master
    
    * commit 'e13b68d9d40aaf61cf36b89f371d9fb3e6ebe47f':
      Updated shebang to more explicit about which version of python to use.
Commits on Dec 7, 2018
  1. Updated shebang to more explicit about which version of python to use.

    Erik Sjöström
    Erik Sjöström committed Dec 7, 2018
    Signed-off-by: Erik Sjöström <esjostrom@op5.com>
Commits on Oct 24, 2018
  1. Merge pull request #121 in MONITOR/merlin from bugfix/use-specific-ve…

    Daniel Nilsson
    Daniel Nilsson committed Oct 24, 2018
    …rsion-gem-parallel_tests to master
    
    * commit 'fe9fe52299cbffc6679547cfb9bd05ee083c4e2e':
      Use specific version of parallel_tests ruby gem
  2. Use specific version of parallel_tests ruby gem

    Daniel Nilsson
    Daniel Nilsson committed Oct 24, 2018
    Previously no version of the parallel_tests ruby gem was specified. This
    means that when the gem is installed it installs the latest version. In
    the latest version of the gem the required version of ruby was up from
    2.0.0 to 2.1.0. We have ruby 2.0.0 on our test environment. Thus gem
    could not be installed and test fails.
    
    In this commit we specifiy the latest version of the parallel_tests ruby
    gem that requires ruby 2.0.0 so that tests will run again. This is
    perhaps not a solution for the long run but it will do for now.
    
    Signed-off-by: Daniel Nilsson <daniel.nilsson@op5.com>
Commits on Oct 18, 2018
  1. Merge pull request #116 in MONITOR/merlin from bugfix/MON-10239-custo…

    jacobbaungard committed Oct 18, 2018
    …m_svc_notification to master
    
    * commit 'd04c95074fe1036667c29b2cfacea95cf14b8b20':
      Send custom notification when node has notifies=no
Commits on Oct 12, 2018
  1. Merge pull request #118 in MONITOR/merlin from bugfix/MON-8056-increa…

    jacobbaungard committed Oct 12, 2018
    …se-graceperiod-for-event-expiry to master
    
    * commit '078a87d30e608a1e5b64ffcd653e8cda317d24f5':
      Increase grace period for expired events
Commits on Oct 11, 2018
  1. Send custom notification when node has notifies=no

    jacobbaungard committed Sep 17, 2018
    Prior to this commit, if a poller was setup with the setting notifies=no
    and you would send a SEND_CUSTOM_HOST/SVC_NOTIFICATION to the Naemon
    query handler, then no notification would be sent. This commit ensure
    that the master correctly will send the notification.
    
    Note that in the case we handle a custom notification on a node that
    normally isn't responsible for the object, then we do not forward the
    external command to any other nodes. This is to ensure that we only send
    one notification in case the systems has disagreements about the
    settings.
    
    This also fixes an issue in general with notifications that might not be
    sent in case of pollers with notifies=no.
    
    This fixes MON-10239
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Oct 8, 2018
  1. Increase grace period for expired events

    jacobbaungard committed Oct 5, 2018
    This increase the grace period for when events should be expired to be at
    least that of the check_interval. This ensures that we do not end up
    having expires events, due to nodes being on slightly different timings.
    
    This fixed MON-8056
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Sep 12, 2018
  1. Merge pull request #114 in MONITOR/merlin from bugfix/MON-11128-fix-s…

    jacobbaungard committed Sep 12, 2018
    …ystemd-filelimits to master
    
    * commit 'b4542b76f62a00eeec9fc9a86cc2b1ab7cdd692c':
      Increase open file limit on EL7
Commits on Sep 6, 2018
  1. Increase open file limit on EL7

    jacobbaungard committed Sep 6, 2018
    Systemd does not use the values set in limit.d and we therefore set them
    directly here.
    
    The lower limit could cause issue for customers with larger setups.
    
    This is part of MON-11128
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Sep 5, 2018
  1. Merge pull request #113 in MONITOR/merlin from feature/contribution_g…

    jacobbaungard committed Sep 5, 2018
    …uidelines to master
    
    * commit 'a2b79e596322bb9c7eddf03394af71f2a058bd2a':
      Add git formatting info to CONTRIBUTING
      DOC: Added contributing guidelines
Commits on Sep 4, 2018
  1. Add git formatting info to CONTRIBUTING

    jacobbaungard committed Sep 4, 2018
    This commit adds information about how the git message should be
    formatted. I.e 50 columns for the first line, and 72 for the body.
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
  2. DOC: Added contributing guidelines

    fmikker authored and jacobbaungard committed Jun 21, 2018
    Contributing guidelines added to conform with Githubs Community Profile:
    https://help.github.com/articles/about-community-profiles-for-public-repositories/
    
    Signed-off-by: Fredrik Mikker <fmikker@op5.com>
Commits on Aug 23, 2018
  1. Merge pull request #112 in MONITOR/merlin from bugfix/MON-11122-run-m…

    jacobbaungard committed Aug 23, 2018
    …erlin-as-root to master
    
    * commit 'c88931a43d5cb00bf817e7fb6a110107b4d775b5':
      Tests: Check that systemd starts merlind as non-root
      Systemd: Run merlind as monitor user
Commits on Aug 22, 2018
  1. Tests: Check that systemd starts merlind as non-root

    jacobbaungard committed Aug 21, 2018
    Part of: MON-11122
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Aug 20, 2018
  1. Systemd: Run merlind as monitor user

    jacobbaungard committed Aug 15, 2018
    This patch ensures that the merlin daemon is runs using the monitor user
    instead of root.
    
    This fixes MON-11122
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Jun 14, 2018
  1. Merge pull request #109 in MONITOR/merlin from bugfix/MON-11000-fix-d…

    jacobbaungard committed Jun 14, 2018
    …ouble-newline-escape to master
    
    * commit '6fc9168e12850bc60861bd5756dcdbd59b9fef34':
      Tests,JSON: do not escape already escaped newlines
Commits on Jun 13, 2018
  1. Tests,JSON: do not escape already escaped newlines

    jacobbaungard committed Jun 12, 2018
    This commit ensures that the JSON library used for the cukemerlin tests
    does not insert an extra escape if a newline is already escape in the
    input.
    
    This fixes MON-11000
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Jun 1, 2018
  1. Merge pull request #108 in MONITOR/merlin from bugfix/MON-11008-passi…

    jacobbaungard committed Jun 1, 2018
    …ve-poller-out-of-sync-after to master
    
    * commit '12985a4be49bf7b93bc4cd78906ae84309baadb4':
      Check if timestamp differ on config when oconf fetch
Commits on May 31, 2018
  1. Check if timestamp differ on config when oconf fetch

    Jonatan Sundeen authored and jacobbaungard committed May 31, 2018
    This fixes the problem with de-sync poller. But preferably it should not require restart just because master is restarted.
    
    This fixes MON-11008
    
    Signed-off-by: Jonatan Sundeen <jsundeen@op5.com>
Commits on May 24, 2018
  1. Merge pull request #107 in MONITOR/merlin from bugfix/MON-9774-oconf-…

    jacobbaungard committed May 24, 2018
    …fetch-not-triggered to master
    
    * commit '62ae6f921390569bc1941ac071f9a0c3e788c675':
      Passive poller: Correctly fetch object config.
Commits on May 23, 2018
  1. Passive poller: Correctly fetch object config.

    jacobbaungard committed May 7, 2018
    This is the fix for MON-9774
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Apr 24, 2018
  1. Merge pull request #106 in MONITOR/merlin from bugfix/MON-7379-import…

    jacobbaungard committed Apr 24, 2018
    …-log-ignore-invalid-timestamped-lines to master
    
    * commit 'c566151df6e777873d3cb9a1dc0e04271cd99dc6':
      Import log: Ignore lines without a valid timestamp
Commits on Apr 18, 2018
  1. Import log: Ignore lines without a valid timestamp

    jacobbaungard committed Apr 17, 2018
    Using "mon log import" would previously result in a crash if the naemon
    log contained a line starting with "[not-a-timestamp]". This commit
    alters the import tool to ignore such cases.
    
    Ignoring invalid log lines is already the default be behavior except when
    the line starts with "[".
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Apr 12, 2018
  1. Merge pull request #105 in MONITOR/merlin from bugfix/MON-9549-allow-…

    Robin Engstrom
    Robin Engstrom committed Apr 12, 2018
    …unresolvable-dns to master
    
    * commit '02d4dbbf2f71776fa88551039de027e5f40ce278':
      Allow nodes with unresolvable DNS names
  2. Allow nodes with unresolvable DNS names

    jacobbaungard committed Apr 10, 2018
    This commit allows Merlin to function with nodes which DNS cannot be
    resolved at startup. If no a given node could not be resolved at
    startup merlin will try to resolve the nodes during the connect_to_all
    function, which checks if disconnected nodes has become online.
    
    Note that if the DNS changes, for a given node, then Merlin should be
    restarted, as it will not attempt to resolve nodes that previously has
    been resolved.
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Mar 22, 2018
  1. Merge pull request #104 in MONITOR/merlin from bugfix/correctly-clean…

    Robin Engstrom
    Robin Engstrom committed Mar 22, 2018
    …-generated-scripts to master
    
    * commit '537fbd5c63c49dfce4d434d4f821cd22194ed46c':
      Clean generated scripts
Commits on Mar 21, 2018
  1. Clean generated scripts

    jacobbaungard committed Mar 21, 2018
    This commit ensures that the generated scripts: apps/libexec/oconf.py
    apps/mon.py apps/libexec/oconf.fetch.sh are deleted upon issuesing "make
    clean".
    
    Signed-off-by: Jacob Hansen <jhansen@op5.com>
Commits on Jan 19, 2018
  1. Merge pull request #103 in MONITOR/merlin from bugfix/fix_el6_ruby to…

    psharmaop5 committed Jan 19, 2018
    … master
    
    * commit 'aa8a760413e9295820db804dcae50672976fe6f8':
      fix ruby issue