Merge "Remove statsd args to OpenStack API client call"

doc/source/installation.rst

@@ -32,6 +32,13 @@ configured to send information to it.  Set the environment variable
 ``STATSD_PORT`` if this should be different to the default ``8125``)
 for the Nodepool daemon to enable this support.
 
+If using the OpenStack driver, setting these variables will enable
+``openstacksdk`` reporting.  By default, ``openstacksdk`` will report
+OpenStack API statistics prefixed with ``openstack.api``.  To override
+this, for example to report API statistics on a per-cloud basis, see
+the OpenStack SDK configuration documentation on `metrics
+<https://docs.openstack.org/openstacksdk/latest/user/guides/stats.html>`__.
+
 Install Nodepool
 ----------------
 

nodepool/driver/openstack/provider.py

@@ -16,7 +16,6 @@
 
 import logging
 import operator
-import os
 import threading
 import time
 
@@ -93,9 +92,6 @@ class OpenStackProvider(Provider, QuotaSupport):
             config=self.provider.cloud_config,
             use_direct_get=False,
             rate_limit=rate_limit,
-            statsd_host=os.getenv('STATSD_HOST', None),
-            statsd_port=os.getenv('STATSD_PORT ', None),
-            statsd_prefix='nodepool.task.{0}'.format(self.provider.name),
             app_name='nodepool',
             app_version=version.version_info.version_string()
         )

releasenotes/notes/openstack-statsd-ff1abe1a46794490.yaml

@@ -0,0 +1,14 @@
+---
+upgrade:
+  - |
+    Nodepool 0.3.6 introduced an unintended behaviour change with
+    ``openstacksdk`` ``statsd`` reporting.  Due to a change in the way
+    nodepool manages OpenStack API calls, all API related statistics
+    created during interaction with clouds are now generated by
+    ``openstacksdk`` and prefixed with ``openstack.api`` instead of
+    being created by nodepool and prefixed with
+    ``nodepool.provider.<cloud>`` as in prior versions.  If you wish
+    to revert to the prior behaviour, changes have been provided to
+    ``openstacksdk`` to allow setting custom prefixes via the cloud
+    configuration file; see `statsd documentation
+    <https://zuul-ci.org/docs/nodepool/installation.html#statsd-and-graphite>`__