From 3af0d3736b7dbf70bb57c84afc7694825da497ad Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 30 Apr 2021 11:08:40 +1000
Subject: [PATCH] nodepool clouds: adds stats prefix

This adds a metrics prefix
(https://review.opendev.org/c/openstack/openstacksdk/+/786814) to each
of our clouds so that we start logging API stats separately again.
See also https://review.opendev.org/c/zuul/nodepool/+/786862

Change-Id: I5910fcbf1b54fa3806a0cc2e539565d47b805d35
---
 .../templates/clouds/nodepool_clouds.yaml.j2  | 57 +++++++++++++++++--
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index b5b24a058d..570808e7fa 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -23,12 +23,21 @@ clouds:
       - name: DFW
         values:
           block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/'
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.rax-dfw'
       - name: ORD
         values:
           block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/'
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.rax-ord'
       - name: IAD
         values:
           block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/'
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.rax-iad'
     api_timeout: 60
     auth:
       username: '{{ nodepool_rackspace_username }}'
@@ -43,8 +52,16 @@ clouds:
     # for now ignore ipv6
     force_ipv4: true
     regions:
-      - BHS1
-      - GRA1
+      - name: BHS1
+        values:
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.ovh-bhs1'
+      - name: GRA1
+        values:
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.ovh-gra1'
     api_timeout: 60
     auth:
       username: '{{ nodepool_ovh_username }}'
@@ -63,11 +80,22 @@ clouds:
           networks:
             - name: inap-17304-WAN1101
               routes_externally: True
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.inap-mtl01'
   vexxhost:
     profile: vexxhost
     regions:
-      - ca-ymq-1
-      - sjc1
+      - name: ca-ymq-1
+        values:
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.vexxhost-ca-ymq-1'
+      - name: sjc1
+        values:
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.vexxhost-sjc1'
     api_timeout: 60
     auth_type: password
     auth:
@@ -87,6 +115,9 @@ clouds:
               routes_externally: false
               routes_ipv6_externally: true
               nat_destination: true
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.linaro-us-regionone'
     identity_api_version: '3'
     auth:
       auth_url: https://us.linaro.cloud:5000
@@ -105,6 +136,9 @@ clouds:
               routes_externally: false
               routes_ipv6_externally: true
               nat_destination: true
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.limestone-regionone'
     auth:
       auth_url: https://osa.continuous.pw:5000
       username: '{{ nodepool_limestone_username }}'
@@ -123,6 +157,9 @@ clouds:
           networks:
             - name: openstackzuul-net
               default_interface: True
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.packethost-us-west-1'
     auth:
       auth_url: https://packet.platform9.net/keystone
       username: '{{ nodepool_packethost_username }}'
@@ -134,7 +171,11 @@ clouds:
     image_format: 'raw'
   airship-citycloud:
     regions:
-      - Kna1
+      - name: Kna1
+        values:
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.airship-citycloud-kna1'
     profile: citycloud
     auth:
       username: '{{ nodepool_airship_username }}'
@@ -149,6 +190,9 @@ clouds:
           networks:
             - name: public5
               default_interface: True
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.osuosl-regionone'
     auth:
       auth_url: https://arm-openstack.osuosl.org:5000/v3
       username: '{{ nodepool_osuosl_username }}'
@@ -167,6 +211,9 @@ clouds:
             - name: External
               routes_externally: true
               default_interface: true
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.inmotion-iad3'
     auth:
       auth_url: 'https://173.231.255.228:5000'
       username: '{{ nodepool_inmotion_username }}'