web.external-url

[sandwitch]

Hi ,

Is it possible to add the following change some way as a variable?
# helper variable indicating prometheus version, so we can use on this information in the template
$prometheus_v2 = true
$daemon_flags = [
"--config.file=${prometheus::server::config_dir}/${prometheus::server::configname}",
"--storage.tsdb.path=${prometheus::server::localstorage}",
"--storage.tsdb.retention=${prometheus::server::storage_retention}",
"--web.console.templates=${prometheus::server::shared_dir}/consoles",
"--web.console.libraries=${prometheus::server::shared_dir}/console_libraries",
"--web.external-url=/prometheus",
]
}

[bastelfreak]

hey @sandwitch, thanks for opening the issue. Can you provide a patch for this?

[tuxmea]

@sandwitch can ypu please check whether the following settings work:

1. no parameter given:

    --web.external-url=''

2. parameter given:

    --web.external-url='/prometheus'

I wonder whether the single quotes are OK.
Otherwise I must rethink the parameter evaluation within the template.

[sandwitch]

I' l try tomorrow.Thanks for the input.

[sandwitch]

puppet-prometheus.patch.txt
We tried with the changes from tuxmea and it is working as expected. We can change the web.external-url from our hiera data! Looks good to is. If you need more input please let us know.
If you still need the patch is is attached.

[tuxmea]

@sandwitch does prometheus still work when you NOT provide hiera data for external web url?

[sandwitch]

Do you mean an empty string or no data @ all?
It does imho:
+++ /tmp/puppet-file20180712-19601-1doxzar 2018-07-12 13:58:01.646688180 +0200
@@ -12,7 +12,7 @@
--storage.tsdb.retention=360h
--web.console.templates=/usr/local/share/prometheus/consoles
--web.console.libraries=/usr/local/share/prometheus/console_libraries \

• --web.external-url='/prometheus' \

• --web.external-url='' \

[tuxmea]

@sandwitch I just want to be sure that no data or empty string still produces valid config.

--web.external-url=''

If this is the case, we can merge this PR.
(valid config = properly running prometheus component)

[sandwitch]

It is working. See puppet's changes above. Is retarted andere gesteld Prometheus. In case of ' ' IT was not working behind the zentral proxy obvious. Testing directly on port 9090 worked however. Would be nice of thuis could be merged. Thanks for your work!

[sandwitch]

Sorry about the phone translation 😂