Skip to content

Commit 07d0729

Browse files
committed
Refactor bosh exporter uaa client id
1 parent fbd242a commit 07d0729

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,11 @@ bosh -d prometheus deploy manifests/prometheus.yml \
9898
-o manifests/operators/monitor-bosh.yml \
9999
-o manifests/operators/enable-bosh-uaa.yml \
100100
-v bosh_url= \
101-
-v uaa_bosh_exporter_client_secret= \
102101
--var-file bosh_ca_cert= \
103102
-v metrics_environment=
104103
```
105104

106-
In case the UAA client_id for bosh_exporter is different from `bosh_exporter`,
107-
run the following command instead:
105+
In case you have configured manually an UAA `client_id `for the `bosh_exporter` (different from `bosh_exporter`), then run the following command instead:
108106

109107
```
110108
bosh -d prometheus deploy manifests/prometheus.yml \
@@ -198,6 +196,7 @@ Please review the op files before deploying them to check the requeriments, depe
198196
| [alertmanager-victorops-receiver.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/alertmanager-victorops-receiver.yml) | Configures a [VictorOps](https://victorops.com/) receiver for `alertmanager` | | | |
199197
| [alertmanager-webhook-receiver.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/alertmanager-webhook-receiver.yml) | Configures a generic webhook receiver for `alertmanager` | | | |
200198
| [alertmanager-web-external-url.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/alertmanager-web-external-url.yml) | Configures the URL under which `alertmanager` is externally reachable | | | |
199+
| [configure-bosh-exporter-uaa-client-id.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/configure-bosh-exporter-uaa-client-id.yml) | Configures a custom `bosh_exporter` UAA `client_id` for the [enable-bosh-uaa.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/enable-bosh-uaa.yml) op-file | | | |
201200
| [enable-bosh-uaa.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/enable-bosh-uaa.yml) | Configures [monitor-bosh.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/monitor-bosh.yml) to use an UAA client (you must apply the [add-bosh-exporter-uaa-clients.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/bosh/add-bosh-exporter-uaa-clients.yml) op file to your [bosh-deployment](https://github.com/cloudfoundry/bosh-deployment)) | | | |
202201
| [enable-cf-route-registrar.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/enable-cf-route-registrar.yml) | Registers `alertmanager`, `grafana`, and `prometheus` as [Cloud Foundry routes](https://docs.cloudfoundry.org/devguide/deploy-apps/routes-domains.html) (under your `system domain`) | | | |
203202
| [enable-grafana-uaa.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/enable-grafana-uaa.yml) | Configures `grafana` user authentication to use [Cloud Foundry UAA](https://docs.cloudfoundry.org/concepts/architecture/uaa.html) (you must apply the [add-grafana-uaa-clients.yml](https://github.com/bosh-prometheus/prometheus-boshrelease/blob/master/manifests/operators/cf/add-grafana-uaa-clients.yml) op file to your [cf-deployment](https://github.com/cloudfoundry/cf-deployment)) | | | |
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
# Apply ./bosh/add-bosh-exporter-uaa-clients.yml to your bosh-deployment
2-
# This should be used together with enable-bosh-uaa.yml
1+
# Apply ./enable-bosh-uaa.yml to your prometheus-deployment
32

4-
# Configure UAA client_id for bosh_exporter
3+
# Configure a custom bosh_exporter UAA client_id
54
- type: replace
6-
path: /releases/name=routing/url
75
path: /instance_groups/name=prometheus2/jobs/name=bosh_exporter/properties/bosh_exporter/bosh/uaa/client_id
86
value: ((uaa_bosh_exporter_client_id))

0 commit comments

Comments
 (0)