[checkmk-commits] [tribe29/checkmk] 0a0b3d: Revert "mk_logwatch: simplify status logic"

Moritz noreply at github.com
Fri Jun 14 13:20:34 CEST 2019


  Branch: refs/heads/master
  Home:   https://github.com/tribe29/checkmk
  Commit: 0a0b3dcbed04e80e3d30179b62c3ba849ba4c9b1
      https://github.com/tribe29/checkmk/commit/0a0b3dcbed04e80e3d30179b62c3ba849ba4c9b1
  Author: Moritz Kiemer <moritz.kiemer at tribe29.com>
  Date:   2019-06-14 (Fri, 14 Jun 2019)

  Changed paths:
    M agents/plugins/mk_logwatch

  Log Message:
  -----------
  Revert "mk_logwatch: simplify status logic"

There are some fixes in the 1.6 branch that need picking.
Reverting this makes life easier.

This reverts commit 89395df23daafbd1043ed51d5b31ed2bdcf3f88b.

Change-Id: Ie69d80f7074ad317f89dc38622f4b8702b86faff


  Commit: 49ba3785989cc2008301f478e672a728f3dce5bf
      https://github.com/tribe29/checkmk/commit/49ba3785989cc2008301f478e672a728f3dce5bf
  Author: Moritz Kiemer <moritz.kiemer at tribe29.com>
  Date:   2019-06-14 (Fri, 14 Jun 2019)

  Changed paths:
    M agents/plugins/mk_logwatch
    M tests/unit/agents/plugins/test_mk_logwatch.py

  Log Message:
  -----------
  mk_logwatch: fix decoding of potentially incomplete lines

We solve this by introducing a class which is to become a
proper iterator. To have a smaller commit, we stick to the
'return None' logic instead of raising StopIteration.

This also fixes CMK-1330

Change-Id: I07991853260bc22215a4822e225861449fc94a65


  Commit: f625146b0ba603d3fcdc4e10a904a333605ff7ab
      https://github.com/tribe29/checkmk/commit/f625146b0ba603d3fcdc4e10a904a333605ff7ab
  Author: Moritz Kiemer <moritz.kiemer at tribe29.com>
  Date:   2019-06-14 (Fri, 14 Jun 2019)

  Changed paths:
    A .werks/7486
    M agents/plugins/mk_logwatch

  Log Message:
  -----------
  7486 FIX mk_logwatch: also consider environment variable REMOTE_ADDR

When mk_logwatch is started via systemd instead of xinetd, the environment
variable holding the remote address is called <tt>REMOTE_ADDR</tt>.
This is now cosidered as well.

Change-Id: Id15d82722dc341e7232df7c6b49265a85f3c79ea


  Commit: ea00a31fb460233feeebb25bf2f95f8783d296da
      https://github.com/tribe29/checkmk/commit/ea00a31fb460233feeebb25bf2f95f8783d296da
  Author: Moritz Kiemer <moritz.kiemer at tribe29.com>
  Date:   2019-06-14 (Fri, 14 Jun 2019)

  Changed paths:
    M agents/plugins/mk_logwatch
    M tests/unit/agents/plugins/test_mk_logwatch.py

  Log Message:
  -----------
  mk_logwatch: handle non-matching patterns separately

This avoids an exception when tring to access opt.maxoutputsize.

Change-Id: Ieb7156dd05bd5e926d4889abf9cc1902e07cfbab


Compare: https://github.com/tribe29/checkmk/compare/8a76eaf382e3...ea00a31fb460


More information about the checkmk-commits mailing list