Merge pull request #1233 from cloudfoundry/add-ops-file-to-enable-cc-worker-metrics

Add ops file to enable cc-worker metrics

Author: svkrieger

operations/README.md

@@ -45,6 +45,7 @@ This is the README for Ops-files. To learn more about `cf-deployment`, go to the
 | [`disable-tls-tcp-routing-isolation-segment-stage-2-route-emitter.yml`](disable-tls-tcp-routing-isolation-segment-stage-2-route-emitter.yml) | Stage 2 deployment for disabling TLS for TCP Routes on isolation segments. See [configuring TCP routes](https://docs.cloudfoundry.org/adminguide/enabling-tcp-routing.html#tls-tcp-routes) for more info. | | **NO ** |
 | [`enable-cc-rate-limiting.yml`](enable-cc-rate-limiting.yml) | Enable rate limiting for UAA-authenticated endpoints. | Introduces variables `cc_rate_limiter_general_limit` and `cc_rate_limiter_unauthenticated_limit` | **NO** |
 | [`enable-cc-v2-rate-limiting.yml`](enable-cc-rate-limiting.yml) | Enable V2 API rate limiting for UAA-authenticated endpoints. | Introduces variables `cc_v2_rate_limiter_general_limit`, `cc_v2_rate_limiter_admin_limit` and `cc_v2_rate_limiter_reset_interval_in_minutes` | **NO** |
+| [`enable-cc-worker-metrics.yml`](enable-cc-worker-metrics.yml) | Enable metrics for cc-workers. | This will setup the metrics endpoint, configure the prom_scraper job and uses mTLS. If you want to use another scraper than prom_scraper you can additionally set `cc.prom_scraper.disabled` to true. | **NO** |
 | [`enable-cpu-throttling.yml`](enable-cpu-throttling.yml) | Configure Garden containers with CPU entitlement. | This ops file requires `set-cpu-weight.yml`. | **YES** |
 | [`enable-nfs-ldap.yml`](enable-nfs-ldap.yml) | Enables LDAP authentication for NFS volume services | Requires `enable-nfs-volume-service.yml`. Introduces [new variables](example-vars-files/vars-enable-nfs-ldap.yml) | **NO** |
 | [`enable-nfs-volume-service.yml`](enable-nfs-volume-service.yml) | Enables volume support and deploys an NFS broker and volume driver | As of cf-deployment v2, you must use the `nfsbrokerpush` errand to cf push the nfs broker after `bosh deploy` completes. | **YES** |

operations/enable-cc-worker-metrics.yml

@@ -0,0 +1,26 @@
+---
+- type: replace
+  path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/publish_metrics?
+  value: true
+
+- type: replace
+  path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/prom_scraper_tls?
+  value:
+    ca_cert: ((cc_worker_prom_scraper_scrape_tls.ca))
+    private_key: ((cc_worker_prom_scraper_scrape_tls.private_key))
+    public_cert: ((cc_worker_prom_scraper_scrape_tls.certificate))
+
+- type: replace
+  path: /variables/-
+  value:
+    name: cc_worker_prom_scraper_scrape_tls
+    options:
+      alternative_names:
+        - cc_worker_metrics
+      ca: metric_scraper_ca
+      common_name: cc_worker_metrics
+      extended_key_usage:
+        - client_auth
+        - server_auth
+    type: certificate
+    update_mode: converge

units/tests/standard_test/operations.yml

@@ -19,6 +19,7 @@ enable-cc-v2-rate-limiting.yml:
   - cc_v2_rate_limiter_general_limit=blah
   - cc_v2_rate_limiter_admin_limit=something
   - cc_v2_rate_limiter_reset_interval_in_minutes=else
+enable-cc-worker-metrics.yml: {}
 enable-cpu-throttling.yml: {}
 enable-nfs-ldap.yml:
   ops: