Merge "Convert to use latest statsd version"

doc/source/installation.rst

@@ -41,8 +41,11 @@ number of nodes you expect to be in use at once.
 Statsd and Graphite
 ~~~~~~~~~~~~~~~~~~~
 
-If you have a Graphite system with statsd, Nodepool can be configured
-to send information to statsd.
+If you have a Graphite system with ``statsd``, Nodepool can be
+configured to send information to it.  Set the environment variable
+``STATSD_HOST`` to the ``statsd`` hostname (and optionally
+``STATSD_PORT`` if this should be different to the default ``8125``)
+for the Nodepool daemon to enable this support.
 
 Install Nodepool
 ----------------

nodepool/nodepool.py

@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from statsd import statsd
 import apscheduler.scheduler
 import gear
 import json
@@ -39,6 +38,7 @@ import jenkins_manager
 import nodedb
 import nodeutils as utils
 import provider_manager
+from stats import statsd
 
 MINS = 60
 HOURS = 60 * MINS

nodepool/stats.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""
+Import and set `statsd` if STATSD_HOST is present in the
+environment, else set it to None.  This mirrors the behaviour of old
+releases of upstream statsd and avoids us having to change anything
+else.
+"""
+
+import os
+import logging
+
+log = logging.getLogger("nodepool.stats")
+
+if os.getenv('STATSD_HOST', None):
+    from statsd.defaults.env import statsd
+    log.info("Statsd reporting to %s:%s" %
+             (os.getenv('STATSD_HOST'),
+              os.getenv('STATSD_PORT', '8125')))
+else:
+    log.info("Statsd reporting disabled")
+    statsd = None

nodepool/task_manager.py

@@ -21,7 +21,7 @@ import threading
 from six.moves import queue as Queue
 import logging
 import time
-from statsd import statsd
+from stats import statsd
 import requests.exceptions
 
 

requirements.txt

@@ -6,7 +6,7 @@ python-jenkins
 paramiko>1.9.0
 python-daemon>=2.0.4
 extras
-statsd>=1.0.0,<3.0
+statsd>=3.0
 apscheduler>=2.1.1,<3.0
 sqlalchemy>=0.8.2,<0.9.0
 pyzmq>=13.1.0,<14.0.0