Merge ~xavpaice/charm-graylog:lp1775118 into ~graylog-charmers/charm-graylog:master

Proposed by Xav Paice
Status: Merged
Approved by: Paul Gear
Approved revision: 9a7b0acc9032ce0d3aec18945d292c6a3640e3f8
Merged at revision: c9663a6215802174a1eb4a2c2d902743599f25c5
Proposed branch: ~xavpaice/charm-graylog:lp1775118
Merge into: ~graylog-charmers/charm-graylog:master
Diff against target: 28 lines (+6/-0)
2 files modified
config.yaml (+4/-0)
reactive/graylog.py (+2/-0)
Reviewer Review Type Date Requested Status
Paul Gear (community) Approve
Review via email: mp+348026@code.launchpad.net

Commit message

Add rest_transport_uri config option

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Paul Gear (paulgear) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision c9663a6215802174a1eb4a2c2d902743599f25c5

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config.yaml b/config.yaml
2index 696cff6..451f73f 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -7,6 +7,10 @@ options:
6 type: string
7 default: "http://0.0.0.0:9000/"
8 description: The uri the web interface will be available at.
9+ rest_transport_uri:
10+ type: string
11+ default: ""
12+ description: If set, this will be promoted in the cluster discovery APIs. You will need to define this, if your Graylog server is running behind a HTTP proxy that is rewriting the scheme, host name or URI. This must not contain a wildcard address (0.0.0.0). Usually takes the form http://192.168.1.1:9001/api/.
13 index_replicas:
14 type: int
15 default: 0
16diff --git a/reactive/graylog.py b/reactive/graylog.py
17index a520e84..400da08 100644
18--- a/reactive/graylog.py
19+++ b/reactive/graylog.py
20@@ -73,6 +73,8 @@ def configure_graylog():
21 set_conf('root_password_sha2', pw_hash)
22 if conf['web_listen_uri']:
23 set_conf('web_listen_uri', conf['web_listen_uri'])
24+ if conf['rest_transport_uri']:
25+ set_conf('rest_transport_uri', conf['rest_transport_uri'])
26
27 # Set application version
28 snap_name = "graylog"

Subscribers

People subscribed via source and target branches

to all changes: