Skip to content

Commit 9a7a559

Browse files
author
Martin Alfke
committed
use web-external-url configuration
- first commit, misses parameter spec testing - maybe needed for alertmanager, too implements voxpupuli#232
1 parent c8a83b4 commit 9a7a559

File tree

8 files changed

+13
-0
lines changed

8 files changed

+13
-0
lines changed

data/defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ prometheus::bin_dir: '/usr/local/bin'
1515
prometheus::version: '1.5.2'
1616
prometheus::install_method: 'url'
1717
prometheus::manage_prometheus_server: false
18+
prometheus::external_url: ''
1819
prometheus::alert_relabel_config: []
1920
prometheus::alertmanagers_config: []
2021
prometheus::alertmanager::config_dir: '/etc/alertmanager'

manifests/config.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"--storage.tsdb.retention=${prometheus::server::storage_retention}",
3131
"--web.console.templates=${prometheus::server::shared_dir}/consoles",
3232
"--web.console.libraries=${prometheus::server::shared_dir}/console_libraries",
33+
"--web.external-url='${prometheus::server::external_url}'",
3334
]
3435
}
3536

manifests/init.pp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@
125125
# prometheus 1.8.*, only durations understood by golang's time.ParseDuration are supported. Starting
126126
# with prometheus 2, durations can also be given in days, weeks and years.
127127
#
128+
# [*external_url*]
129+
# The URL under which Alertmanager is externally reachable (for example, if Alertmanager is served
130+
# via a reverse proxy). Used for generating relative and absolute links back to Alertmanager itself.
131+
# If omitted, relevant URL components will be derived automatically.
132+
#
128133
# Actions:
129134
#
130135
# Requires: see Modulefile
@@ -174,6 +179,7 @@
174179
Hash $config_hash = {},
175180
Hash $config_defaults = {},
176181
String $os = downcase($facts['kernel']),
182+
Variant[Stdlib::HTTPUrl, Stdlib::Unixpath, String[0]] $external_url,
177183
) {
178184

179185
case $arch {

manifests/server.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
Boolean $manage_group = $prometheus::manage_group,
4343
Boolean $purge_config_dir = $prometheus::purge_config_dir,
4444
Boolean $manage_user = $prometheus::manage_user,
45+
Variant[Stdlib::HTTPurl, Stdlib::Unixpath, String[0]] $external_url = $prometheus::external_url,
4546
) inherits prometheus {
4647

4748
if( versioncmp($version, '1.0.0') == -1 ){

spec/fixtures/files/prometheus2.debian

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ DAEMON_ARGS="--config.file=/etc/prometheus/prometheus.yaml
2323
--storage.tsdb.retention=360h
2424
--web.console.templates=/usr/local/share/prometheus/consoles
2525
--web.console.libraries=/usr/local/share/prometheus/console_libraries
26+
--web.external-url=''
2627
"
2728
USER=prometheus
2829
SCRIPTNAME=/etc/init.d/$NAME

spec/fixtures/files/prometheus2.systemd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ExecStart=/usr/local/bin/prometheus \
1212
--storage.tsdb.retention=360h \
1313
--web.console.templates=/usr/local/share/prometheus/consoles \
1414
--web.console.libraries=/usr/local/share/prometheus/console_libraries \
15+
--web.external-url='' \
1516

1617
ExecReload=/bin/kill -HUP $MAINPID
1718
KillMode=process

spec/fixtures/files/prometheus2.sysv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ start() {
5656
--storage.tsdb.retention=360h \
5757
--web.console.templates=/usr/local/share/prometheus/consoles \
5858
--web.console.libraries=/usr/local/share/prometheus/console_libraries \
59+
--web.external-url='' \
5960
>> "$LOG_FILE" &
6061
retcode=$?
6162
mkpidfile

spec/fixtures/files/prometheus2.upstart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ script
2727
--storage.tsdb.retention=360h \
2828
--web.console.templates=/usr/local/share/prometheus/consoles \
2929
--web.console.libraries=/usr/local/share/prometheus/console_libraries \
30+
--web.external-url='' \
3031

3132
end script
3233

0 commit comments

Comments
 (0)