Merge ~xavpaice/charm-graylog:bug/1925272 into charm-graylog:master

WIP: functest failing:

2021-04-21 17:25:42 [INFO] ======================================================================
2021-04-21 17:25:42 [INFO] FAIL: test_nrpe_config (tests.test_legacy.LegacyTests)
2021-04-21 17:25:42 [INFO] Verify that the specific nrpe check is configured.
2021-04-21 17:25:42 [INFO] ----------------------------------------------------------------------
2021-04-21 17:25:42 [INFO] Traceback (most recent call last):
2021-04-21 17:25:42 [INFO] File "./tests/test_legacy.py", line 132, in test_nrpe_config
2021-04-21 17:25:42 [INFO] cfg = self.get_file_contents(
2021-04-21 17:25:42 [INFO] File "/home/xav/charms/charm-graylog/src/.tox/func/lib/python3.8/site-packages/charmhelpers/core/decorators.py", line 40, in _retry_on_exception_inner_2
2021-04-21 17:25:42 [INFO] return f(*args, **kwargs)
2021-04-21 17:25:42 [INFO] File "./tests/test_legacy.py", line 147, in get_file_contents
2021-04-21 17:25:42 [INFO] result = self.run_command(unit, "cat '{}'".format(filename))
2021-04-21 17:25:42 [INFO] File "./tests/test_legacy.py", line 119, in run_command
2021-04-21 17:25:42 [INFO] assert result["Code"] == "0"
2021-04-21 17:25:42 [INFO] AssertionError
2021-04-21 17:25:42 [INFO] ----------------------------------------------------------------------
2021-04-21 17:25:42 [INFO] Ran 6 tests in 327.129s
2021-04-21 17:25:42 [INFO] FAILED
2021-04-21 17:25:42 [INFO] (failures=1)
2021-04-21 17:25:42 [ERROR] {'gl2': 'zaza-8ce00c21ce29'}
2021-04-21 17:25:42 [ERROR] Model gl2 (zaza-8ce00c21ce29)
Traceback (most recent call last):
  File "/home/xav/charms/charm-graylog/src/.tox/func/bin/functest-run-suite", line 8, in <module>
    sys.exit(main())
  File "/home/xav/charms/charm-graylog/src/.tox/func/lib/python3.8/site-packages/zaza/charm_lifecycle/func_test_runner.py", line 308, in main
    func_test_runner(
  File "/home/xav/charms/charm-graylog/src/.tox/func/lib/python3.8/site-packages/zaza/charm_lifecycle/func_test_runner.py", line 242, in func_test_runner
    run_env_deployment(env_deployment, keep_model=preserve_model,
  File "/home/xav/charms/charm-graylog/src/.tox/func/lib/python3.8/site-packages/zaza/charm_lifecycle/func_test_runner.py", line 147, in run_env_deployment
    test.test(
  File "/home/xav/charms/charm-graylog/src/.tox/func/lib/python3.8/site-packages/zaza/charm_lifecycle/test.py", line 122, in test
    run_test_list(tests)
  File "/home/xav/charms/charm-graylog/src/.tox/func/lib/python3.8/site-packages/zaza/charm_lifecycle/test.py", line 111, in run_test_list
    get_test_runners()[runner](testcase, _testcase)
  File "/home/xav/charms/charm-graylog/src/.tox/func/lib/python3.8/site-packages/zaza/charm_lifecycle/test.py", line 73, in run_unittest
    assert test_result.wasSuccessful(), "Test run failed"
AssertionError: Test run failed

A CI job is currently in progress. A follow up comment will be added when it completes.

FAILED: Continuous integration, rev:f35868a976d04d821d68fe464da674362a525ad7

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~xavpaice/charm-graylog/+git/graylog-charm/+merge/401505/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/13/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/23/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/192/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/13//rebuild

have been unable to reproduce test failures. Let's get this reviewed.

FAILED: Continuous integration, rev:f35868a976d04d821d68fe464da674362a525ad7
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/26/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/198/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/14//rebuild

A CI job is currently in progress. A follow up comment will be added when it completes.

PASSED: Continuous integration, rev:66e842c2047c8c43bd3fca88e016b4297d97e47e
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/27/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/199/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/15//rebuild

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Abstaining, just claimed the review to take it off the canonical-is-reviewers dashboard, mergebot has been switched to add bootstack-reviewers for future MPs.

Code looks good to me, but we're missing a functional test bundle file (see comment inline) and I think there are some unit tests missing for validating handling of rest_listen_uri.

I won't block on the tests, but the bundle is required to merge.

Added bundles.

The MockKv class is there because with v2 we use db.set("web_listen_uri"... which needs mocking better than a dict can manage.

The url tests are in test_api (test_lib.py), hidden away. A decent refactor would move the whole url logic to the lib and make testing simpler, but that's well outside the scope of this change.

A CI job is currently in progress. A follow up comment will be added when it completes.

PASSED: Continuous integration, rev:f7b31f9248be0054516b788927e364901849c666
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/30/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/67/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/264/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/30//rebuild

lgtm

Not implement any new feature in gralogy2 anymore. So reject this PR