1
diff --git a/src/lib/charms/layer/graylog/api.py b/src/lib/charms/layer/graylog/api.py
2
index 7445fa6..8640650 100644
3
--- a/src/lib/charms/layer/graylog/api.py
4
+++ b/src/lib/charms/layer/graylog/api.py
5
@@ -59,7 +59,7 @@ class GraylogApi:
6
59
        self.token = None
59
        self.token = None
7
60
        self.input_types = None
60
        self.input_types = None
8
61
        self.req_retries = 4
61
        self.req_retries = 4
10
62
        self.req_timeout = 3
62
        self.req_timeout = 10
11
63
        self.verify = verify
63
        self.verify = verify
12
64
64
13
65
    @retry(
65
    @retry(
14
diff --git a/src/reactive/graylog.py b/src/reactive/graylog.py
15
index 640e262..5e81f22 100644
16
--- a/src/reactive/graylog.py
17
+++ b/src/reactive/graylog.py
18
@@ -598,11 +598,8 @@ def graylog_remove_filebeat_input():
19
598
    inputs = g.log_input_get()
598
    inputs = g.log_input_get()
20
599
599
21
600
    if inputs is not None:
600
    if inputs is not None:
22
601
23
602
        for inp in inputs:
601
        for inp in inputs:
24
603
25
604
            if inp["title"].lower() == "juju_beats_input":
602
            if inp["title"].lower() == "juju_beats_input":
26
605
27
606
                g.log_input_remove(inp["id"])
603
                g.log_input_remove(inp["id"])
28
607
                hookenv.log(
604
                hookenv.log(
29
608
                    "Removed beats input: {} ({})".format(inp["title"], inp["id"])
605
                    "Removed beats input: {} ({})".format(inp["title"], inp["id"])
30
@@ -933,10 +930,7 @@ def setup_gelf_tcp_input(gelf):
31
933
        "title": "juju_gelf_tcp_input",
930
        "title": "juju_gelf_tcp_input",
32
934
        "type": type,
931
        "type": type,
33
935
        "global": "true",
932
        "global": "true",
38
936
        "configuration": {
933
        "configuration": {"bind_address": "0.0.0.0", "port": gelf_port},
35
937
            "bind_address": "0.0.0.0",
36
938
            "port": gelf_port,
37
939
        },
39
940
    }
934
    }
40
941
935
41
942
    proto = "TCP"
936
    proto = "TCP"
42
@@ -1107,11 +1101,7 @@ def validate_jvm_heap_size(str_size, total_mem=0):
43
1107
            raise ValueError("jvm heap size must be a multiple of 1024")
1101
            raise ValueError("jvm heap size must be a multiple of 1024")
44
1108
    else:
1102
    else:
45
1109
        # only allow these units, and scale is 1024
1103
        # only allow these units, and scale is 1024
51
1110
        units = {
1104
        units = {"k": 1024, "m": 1024 * 1024, "g": 1024 * 1024 * 1024}
47
1111
            "k": 1024,
48
1112
            "m": 1024 * 1024,
49
1113
            "g": 1024 * 1024 * 1024,
50
1114
        }
52
1115
        for unit, scale in units.items():
1105
        for unit, scale in units.items():
53
1116
            if str_size.endswith(unit):
1106
            if str_size.endswith(unit):
54
1117
                str_size = str_size[:-1]  # rm unit
1107
                str_size = str_size[:-1]  # rm unit
55
@@ -1517,10 +1507,7 @@ def _maybe_install_ca_certificates_hook():
56
1517
1507
57
1518
def _maybe_configure_graylog_jvm_keystore():
1508
def _maybe_configure_graylog_jvm_keystore():
58
1519
    templating.render(
1509
    templating.render(
63
1520
        "default-graylog-server",
1510
        "default-graylog-server", SERVER_DEFAULT_CONF_FILE, context={}, perms=0o644
60
1521
        SERVER_DEFAULT_CONF_FILE,
61
1522
        context={},
62
1523
        perms=0o644,
64
1524
    )
1511
    )
65
1525
1512
66
1526
1513
Status:	Merged
Approved by:	Erhan Sunar on 2023-02-15
Approved revision:	43e4cb8232fdea674cfaa38ecfa324f78a295da3
Merged at revision:	c9843b7aee427aacd795f1be13317b338a0ea4a9
Proposed branch:	~seyeongkim/charm-graylog:increase_timeout_for_request
Merge into:	charm-graylog:master
Diff against target:	64 lines (+4/-17) 2 files modified src/lib/charms/layer/graylog/api.py (+1/-1) src/reactive/graylog.py (+3/-16)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ramesh Sattaru (community)		2023-02-02	Approve on 2023-02-02
Erhan Sunar (community)		2023-02-02	Approve on 2023-02-02
🤖 prod-jenkaas-bootstack (community)	continuous-integration		Approve on 2023-02-02
Review via email: mp+436739@code.launchpad.net