Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert exporter credentials to envvars, round 2 #367

Merged
merged 4 commits into from
Jan 2, 2020
Merged

Convert exporter credentials to envvars, round 2 #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
464a141
bosh_tsdb_exporter
aegershman Dec 23, 2019
af1ac18
credhub_exporter
aegershman Dec 23, 2019
a5c6942
redis_exporter
aegershman Dec 23, 2019
2b2058c
shield_exporter
aegershman Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions jobs/bosh_tsdb_exporter/templates/bin/bosh_tsdb_exporter_ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ case $1 in
pid_guard ${PIDFILE} "bosh_tsdb_exporter"
echo $$ > ${PIDFILE}

<% if_p('bosh_tsdb_exporter.web.auth_password') do |auth_password| %>
export BOSH_TSDB_EXPORTER_WEB_AUTH_PASSWORD="<%= auth_password %>"
<% end %>

exec bosh_tsdb_exporter \
<% if_p('bosh_tsdb_exporter.log_format') do |log_format| %> \
--log.format="<%= log_format %>" \
Expand All @@ -40,9 +44,6 @@ case $1 in
<% if_p('bosh_tsdb_exporter.web.auth_username') do |auth_username| %> \
--web.auth.username="<%= auth_username %>" \
<% end %> \
<% if_p('bosh_tsdb_exporter.web.auth_password') do |auth_password| %> \
--web.auth.password="<%= auth_password %>" \
<% end %> \
<% if_p('bosh_tsdb_exporter.web.tls_cert', 'bosh_tsdb_exporter.web.tls_key') do %> \
--web.tls.cert_file="/var/vcap/jobs/bosh_tsdb_exporter/config/web_tls_cert.pem" \
--web.tls.key_file="/var/vcap/jobs/bosh_tsdb_exporter/config/web_tls_key.pem" \
Expand Down
9 changes: 5 additions & 4 deletions jobs/credhub_exporter/templates/bin/credhub_exporter_ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ case $1 in
end
%>

export CREDHUB_EXPORTER_CLIENT_SECRET="<%= p('credhub_exporter.credhub.client_secret') %>"
<% if_p('credhub_exporter.web.auth_password') do |auth_password| %>
export CREDHUB_EXPORTER_WEB_AUTH_PASSWORD="<%= auth_password %>"
<% end %>

exec credhub_exporter \
--credhub.api-url="<%= url %>" \
--credhub.client-id="<%= p('credhub_exporter.credhub.client_id') %>" \
--credhub.client-secret="<%= p('credhub_exporter.credhub.client_secret') %>" \
<% if not ca_certs.empty? %> \
--credhub.ca-certs-path="/var/vcap/jobs/credhub_exporter/config/credhub_tls_ca_cert.pem" \
<% end %> \
Expand Down Expand Up @@ -83,9 +87,6 @@ case $1 in
<% if_p('credhub_exporter.web.auth_username') do |auth_username| %> \
--web.auth.username="<%= auth_username %>" \
<% end %> \
<% if_p('credhub_exporter.web.auth_password') do |auth_password| %> \
--web.auth.password="<%= auth_password %>" \
<% end %> \
<% if_p('credhub_exporter.web.tls_cert', 'credhub_exporter.web.tls_key') do %> \
--web.tls.cert_file="/var/vcap/jobs/credhub_exporter/config/web_tls_cert.pem" \
--web.tls.key_file="/var/vcap/jobs/credhub_exporter/config/web_tls_key.pem" \
Expand Down
7 changes: 4 additions & 3 deletions jobs/redis_exporter/templates/bin/redis_exporter_ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ case $1 in
pid_guard ${PIDFILE} "redis_exporter"
echo $$ > ${PIDFILE}

<% if_p('redis_exporter.redis.password') do |password| %>
export REDIS_PASSWORD="<%= password %>"
<% end %>

exec redis_exporter \
<% if_p('redis_exporter.redis.check_keys') do |check_keys| %> \
-check-keys="<%= check_keys %>" \
Expand Down Expand Up @@ -55,9 +59,6 @@ case $1 in
<% if_p('redis_exporter.redis.address') do |address| %> \
-redis.addr="<%= address %>" \
<% end %> \
<% if_p('redis_exporter.redis.password') do |password| %> \
-redis.password="<%= password %>" \
<% end %> \
<% if_p('redis_exporter.redis.script') do |script| %> \
-script="/var/vcap/jobs/redis_exporter/config/script" \
<% end %> \
Expand Down
10 changes: 6 additions & 4 deletions jobs/shield_exporter/templates/bin/shield_exporter_ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,15 @@ case $1 in
export SHIELD_TRACE="<%= trace %>"
<% end %>

export SHIELD_EXPORTER_SHIELD_PASSWORD="<%= p('shield_exporter.shield.password') %>"

<% if_p('shield_exporter.web.auth_password') do |auth_password| %>
export SHIELD_EXPORTER_WEB_AUTH_PASSWORD="<%= auth_password %>"
<% end %>

exec shield_exporter \
--shield.backend_url="<%= p('shield_exporter.shield.backend_url') %>" \
--shield.username="<%= p('shield_exporter.shield.username') %>" \
--shield.password="<%= p('shield_exporter.shield.password') %>" \
<% if_p('shield_exporter.filter.collectors') do |collectors| %> \
--filter.collectors="<%= collectors %>" \
<% end %> \
Expand All @@ -66,9 +71,6 @@ case $1 in
<% if_p('shield_exporter.web.auth_username') do |auth_username| %> \
--web.auth.username="<%= auth_username %>" \
<% end %> \
<% if_p('shield_exporter.web.auth_password') do |auth_password| %> \
--web.auth.password="<%= auth_password %>" \
<% end %> \
<% if_p('shield_exporter.web.tls_cert', 'shield_exporter.web.tls_key') do %> \
--web.tls.cert_file="/var/vcap/jobs/shield_exporter/config/web_tls_cert.pem" \
--web.tls.key_file="/var/vcap/jobs/shield_exporter/config/web_tls_key.pem" \
Expand Down