Merge ~seyeongkim/charm-graylog:increase_timeout_for_request into charm-graylog:master

[Seyeong Kim]

increasing timeout for request

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:60d8e81cb65549c849c9160f179c6a665a0f9145
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/220/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/2174/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1981/

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

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:fb085faecca8bc6bfa818f9590dd4c975bfafa4f
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/221/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/2176/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1983/

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

review: Needs Fixing (continuous-integration)

[Erhan Sunar (esunar)]

There is a linting error(it blocks running of functional tests) can you fix?

black --check --exclude '/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/' .

review: Needs Fixing

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:43e4cb8232fdea674cfaa38ecfa324f78a295da3
https://jenkins.canonical.com/bootstack/job/lp-charm-graylog-ci/222/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/2178/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1985/

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

review: Approve (continuous-integration)

[Erhan Sunar (esunar)]

review: Approve

[Ramesh Sattaru (rameshcan)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision c9843b7aee427aacd795f1be13317b338a0ea4a9

diff --git a/src/lib/charms/layer/graylog/api.py b/src/lib/charms/layer/graylog/api.py
index 7445fa6..8640650 100644
--- a/src/lib/charms/layer/graylog/api.py
+++ b/src/lib/charms/layer/graylog/api.py
@@ -59,7 +59,7 @@ class GraylogApi:
         self.token = None
         self.input_types = None
         self.req_retries = 4
-        self.req_timeout = 3
+        self.req_timeout = 10
         self.verify = verify
 
     @retry(
diff --git a/src/reactive/graylog.py b/src/reactive/graylog.py
index 640e262..5e81f22 100644
--- a/src/reactive/graylog.py
+++ b/src/reactive/graylog.py
@@ -598,11 +598,8 @@ def graylog_remove_filebeat_input():
     inputs = g.log_input_get()
 
     if inputs is not None:
-
         for inp in inputs:
-
             if inp["title"].lower() == "juju_beats_input":
-
                 g.log_input_remove(inp["id"])
                 hookenv.log(
                     "Removed beats input: {} ({})".format(inp["title"], inp["id"])
@@ -933,10 +930,7 @@ def setup_gelf_tcp_input(gelf):
         "title": "juju_gelf_tcp_input",
         "type": type,
         "global": "true",
-        "configuration": {
-            "bind_address": "0.0.0.0",
-            "port": gelf_port,
-        },
+        "configuration": {"bind_address": "0.0.0.0", "port": gelf_port},
     }
 
     proto = "TCP"
@@ -1107,11 +1101,7 @@ def validate_jvm_heap_size(str_size, total_mem=0):
             raise ValueError("jvm heap size must be a multiple of 1024")
     else:
         # only allow these units, and scale is 1024
-        units = {
-            "k": 1024,
-            "m": 1024 * 1024,
-            "g": 1024 * 1024 * 1024,
-        }
+        units = {"k": 1024, "m": 1024 * 1024, "g": 1024 * 1024 * 1024}
         for unit, scale in units.items():
             if str_size.endswith(unit):
                 str_size = str_size[:-1]  # rm unit
@@ -1517,10 +1507,7 @@ def _maybe_install_ca_certificates_hook():
 
 def _maybe_configure_graylog_jvm_keystore():
     templating.render(
-        "default-graylog-server",
-        SERVER_DEFAULT_CONF_FILE,
-        context={},
-        perms=0o644,
+        "default-graylog-server", SERVER_DEFAULT_CONF_FILE, context={}, perms=0o644
     )