Merge pull request #2553 from deniszh/backport/1.1.x/pr-2549_pr-2552_…

…pr-2552_pr-2552

[1.1.x] Adding Hisser and Go-graphite buckytools in tools documentation (#2549) | reformat flake8 ignore list (#2552) | flake8: re-enable some rules which need the least churn to fix (#2552) | flake8: enable for all subdirs except contrib/

bin/run-graphite-devel-server.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
-import sys, os
+import os
+import sys
 from optparse import OptionParser
 
 from django.core import management

check-dependencies.py

@@ -156,3 +156,21 @@
   sys.exit(1)
 else:
   print("All necessary dependencies are met.")
+
+
+# suppress unused-import warnings
+__all__ = [
+    'whisper',
+    'ceres',
+    'cairo',
+    'django',
+    'pytz',
+    'pyparsing',
+    'tagging',
+    'memcache',
+    'ldap',
+    'txamqp',
+    'rrdtool',
+    'whitenoise',
+    'pyhash',
+]

docs/conf.py

@@ -11,7 +11,14 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import re
+import sys
+
+from sphinx.ext import autodoc
+
+# Bring in the new ReadTheDocs sphinx theme
+import sphinx_rtd_theme
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -22,7 +29,7 @@
 os.environ['DJANGO_SETTINGS_MODULE'] = "graphite.settings"
 
 # Prevent graphite logger from complaining about missing log dir.
-from graphite import settings
+from graphite import settings  # noqa: E402
 settings.LOG_DIR = os.path.abspath('.')
 
 try:
@@ -32,13 +39,9 @@
 else:
     setup()
 
-# Bring in the new ReadTheDocs sphinx theme
-import sphinx_rtd_theme
 
 # Define a custom autodoc documenter for the render.functions module
 # This will remove the requestContext parameter which doesnt make sense in the context of the docs
-import re
-from sphinx.ext import autodoc
 class RenderFunctionDocumenter(autodoc.FunctionDocumenter):
   priority = 10 # Override FunctionDocumenter
 
@@ -53,9 +56,11 @@ def format_args(self):
       # Really, a regex sub here is by far the easiest way
       return re.sub('requestContext, ','',args)
 
+
 def setup(app):
   app.add_autodocumenter(RenderFunctionDocumenter)
 
+
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions

docs/tools.rst

@@ -270,6 +270,9 @@ If you wish to use a backend to graphite other than Whisper, there are some opti
 `Cyanite`_
   A highly available, elastic, and low-latency time-series storage wirtten on top of Cassandra
 
+`hisser`_
+  Time series database, backend for graphite, fast alternative to carbon + whisper.
+
 `graphite-clickhouse`_
   Graphite-web backend with `ClickHouse`_ support. Please also see `carbon-clickhouse`_.
 
@@ -305,6 +308,9 @@ Other
 `carbonate`_
   Utilities for managing graphite clusters.
 
+`go-graphite buckytools`_
+  Fork of `buckytools`_, with more features.
+
 `graphite-dl4j`_
   Experimental: Train a model for predictions. Machine learning using data from graphite.
 
@@ -354,6 +360,7 @@ Other
 .. _Gdash: https://github.com/ripienaar/gdash.git
 .. _Giraffe: http://kenhub.github.com/giraffe
 .. _go-carbon: https://github.com/lomik/go-carbon
+.. _go-graphite buckytools: https://github.com/go-graphite/buckytools
 .. _Grafana: http://grafana.org
 .. _Grafsy: https://github.com/leoleovich/grafsy
 .. _Graphene: http://jondot.github.com/graphene
@@ -378,6 +385,7 @@ Other
 .. _Grockets: https://github.com/disqus/grockets
 .. _Gruffalo: https://github.com/outbrain/gruffalo
 .. _HoardD: https://github.com/coredump/hoardd
+.. _hisser: https://github.com/baverman/hisser
 .. _Host sFlow: http://host-sflow.sourceforge.net
 .. _Hubot: https://github.com/github/hubot
 .. _hubot-scripts: https://github.com/github/hubot-scripts

examples/example-client.py

@@ -16,33 +16,35 @@
 import sys
 import time
 import os
-import platform 
+import platform
 import subprocess
 from socket import socket
 
 CARBON_SERVER = '127.0.0.1'
 CARBON_PORT = 2003
 
-delay = 60 
+delay = 60
 if len(sys.argv) > 1:
   delay = int( sys.argv[1] )
 
+
 def get_loadavg():
-  # For more details, "man proc" and "man uptime"  
+  # For more details, "man proc" and "man uptime"
   if platform.system() == "Linux":
     return open('/proc/loadavg').read().strip().split()[:3]
-  else:   
+  else:
     command = "uptime"
     process = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
     os.waitpid(process.pid, 0)
     output = process.stdout.read().replace(',', ' ').strip().split()
     length = len(output)
     return output[length - 3:length]
 
+
 sock = socket()
 try:
   sock.connect( (CARBON_SERVER,CARBON_PORT) )
-except:
+except Exception:
   print("Couldn't connect to %(server)s on port %(port)d, is carbon-agent.py running?" % { 'server':CARBON_SERVER, 'port':CARBON_PORT })
   sys.exit(1)
 

setup.cfg

@@ -18,46 +18,59 @@ provides = graphite
 obsoletes = graphite <= 0.9.9
 
 [flake8]
-# E501 line too long
-# E111 indentation is not a multiple of four
-# E128 continuation line under-indented for visual indent
-# E201 whitespace after '('
-# E202 whitespace before ')'
-# E203 whitespace before ':'
-# E231 missing whitespace after ','
-# E251 unexpected spaces around keyword / parameter equals
-# E124 closing bracket does not match visual indentation
-# E265 block comment should start with '# '
-# E121 continuation line under-indented for hanging indent
-# E261 at least two spaces before inline comment
-# E226 missing whitespace around arithmetic operator
-# E262 inline comment should start with '# '
-# E701 multiple statements on one line (colon)
-# E241 multiple spaces after ':'
-# E221 multiple spaces before operator
-# E703 statement ends with a semicolon
-# E502 the backslash is redundant between brackets
-# F841 local variable 'stuff' is assigned to but never used
-# E401 multiple imports on one line
-# E222 multiple spaces after operator
-# E126 continuation line over-indented for hanging indent
-# E122 continuation line missing indentation or outdented
-# E222 multiple spaces after operator
-# E225 missing whitespace around operator
-# E228 missing whitespace around modulo operator
-# E127 continuation line over-indented for visual indent
-# E123 closing bracket does not match indentation of opening bracket's line
-# E713 test for membership should be 'not in'
-# E125 continuation line with same indent as next logical line
-# E227 missing whitespace around bitwise or shift operator
-# E271 multiple spaces after keyword
-# E272 multiple spaces before keyword
-# N802 function name should be lowercase
-# N803 argument name should be lowercase
-# N806 variable in function should be lowercase
-# E731 do not assign a lambda expression, use a def
-# E114 indentation is not a multiple of four (comment)
-# E266 too many leading '#' for block comment
-# W504 line break after binary operator
-# W605 invalid escape sequence
-ignore=E128,E111,E501,E231,E201,E202,E203,E251,E124,E265,E121,E261,E226,E262,E701,E241,E221,E703,E502,F841,E401,E222,E126,E122,E222,E225,E228,E127,E123,E713,E125,E227,E271,E272,N802,N803,N806,E731,E114,E266,W504,W605
+exclude = .tox,contrib
+ignore =
+    # E111 indentation is not a multiple of four
+    E111,
+    # E114 indentation is not a multiple of four (comment)
+    E114,
+    # E121 continuation line under-indented for hanging indent
+    E121,
+    # E122 continuation line missing indentation or outdented
+    E122,
+    # E124 closing bracket does not match visual indentation
+    E124,
+    # E126 continuation line over-indented for hanging indent
+    E126,
+    # E128 continuation line under-indented for visual indent
+    E128,
+    # E201 whitespace after '('
+    E201,
+    # E202 whitespace before ')'
+    E202,
+    # E203 whitespace before ':'
+    E203,
+    # E221 multiple spaces before operator
+    E221,
+    # E222 multiple spaces after operator
+    E222,
+    # E225 missing whitespace around operator
+    E225,
+    # E226 missing whitespace around arithmetic operator
+    E226,
+    # E231 missing whitespace after ','
+    E231,
+    # E241 multiple spaces after ':'
+    E241,
+    # E251 unexpected spaces around keyword / parameter equals
+    E251,
+    # E261 at least two spaces before inline comment
+    E261,
+    # E262 inline comment should start with '# '
+    E262,
+    # E265 block comment should start with '# '
+    E265,
+    # E266 too many leading '#' for block comment
+    E266,
+    # E501 line too long
+    E501,
+    # W504 line break after binary operator
+    W504,
+    # E701 multiple statements on one line (colon)
+    E701,
+    # E713 test for membership should be 'not in'
+    E713,
+    # E731 do not assign a lambda expression, use a def
+    E731,
+    # F841 local variable 'stuff' is assigned to but never used
+    F841,

setup.py

@@ -134,7 +134,7 @@ def read(fname):
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
-          ],
+      ],
       **setup_kwargs
     )
 finally:

tox.ini

@@ -65,5 +65,5 @@ basepython = python3.8
 deps =
 	flake8
 commands =
-	flake8 {toxinidir}/webapp/graphite
-	flake8 {toxinidir}/webapp/tests
+	flake8 --version
+	flake8 --show-source {toxinidir}

webapp/graphite/account/ldapBackend.py

@@ -12,7 +12,9 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-import ldap, traceback
+import traceback
+
+import ldap
 from django.conf import settings
 from django.contrib.auth.models import User
 

webapp/graphite/dashboard/views.py

@@ -233,7 +233,7 @@ def save(request, name):
     dashboard = Dashboard.objects.create(name=name, state=state)
   else:
     dashboard.state = state
-    dashboard.save();
+    dashboard.save()
 
   return json_response( dict(success=True) )
 
@@ -252,7 +252,7 @@ def save_template(request, name, key):
     template.save()
   else:
     template.setState(state, key)
-    template.save();
+    template.save()
 
   return json_response( dict(success=True) )
 

webapp/graphite/logger.py

@@ -12,7 +12,8 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-import os, logging
+import os
+import logging
 from logging.handlers import TimedRotatingFileHandler as Rotater
 try:
     from logging import NullHandler

webapp/graphite/render/functions.py

@@ -72,7 +72,7 @@ def safeFunc(values):
 def gcd(a, b):
   if b == 0:
     return a
-  return gcd(b, a%b)
+  return gcd(b, a % b)
 
 
 # Least common multiple
@@ -2246,7 +2246,7 @@ def stacked(requestContext,seriesLists,stackName='__DEFAULT__'):
     totalStack = requestContext['totalStack'].get(stackName, [])
   else:
     requestContext['totalStack'] = {}
-    totalStack = [];
+    totalStack = []
   results = []
   for series in seriesLists:
     newValues = []
@@ -2450,9 +2450,10 @@ def cactiStyle(requestContext, seriesList, system=None, units=None):
           fmt = lambda x:"%.2f%s" % format_units(x,system=system)
   else:
       if units:
-          fmt = lambda x:"%.2f %s"%(x,units)
+          fmt = lambda x: "%.2f %s" % (x, units)
       else:
-          fmt = lambda x:"%.2f"%x
+          fmt = lambda x: "%.2f" % x
+
   nameLen = max([0] + [len(getattr(series,"name")) for series in seriesList])
   lastLen = max([0] + [len(fmt(int(safe.safeLast(series) or 3))) for series in seriesList]) + 3
   maxLen = max([0] + [len(fmt(int(safe.safeMax(series) or 3))) for series in seriesList]) + 3
@@ -2477,9 +2478,9 @@ def cactiStyle(requestContext, seriesList, system=None, units=None):
 
       series.name = "%*s Current:%*s Max:%*s Min:%*s " % \
           (-nameLen, series.name,
-            -lastLen, last,
-            -maxLen, maximum,
-            -minLen, minimum)
+           -lastLen, last,
+           -maxLen, maximum,
+           -minLen, minimum)
   return seriesList
 
 
@@ -3207,7 +3208,7 @@ def averageOutsidePercentile(requestContext, seriesList, n):
   averages = [safe.safeAvg(s) for s in seriesList]
 
   if n < 50:
-    n = 100 - n;
+    n = 100 - n
 
   lowPercentile = _getPercentile(averages, 100 - n)
   highPercentile = _getPercentile(averages, n)
@@ -3642,9 +3643,7 @@ def stdev(requestContext, seriesList, points, windowTolerance=0.1):
         currentSum += newValue
         currentSumOfSquares += newValue**2
 
-      if validPoints > 0 and \
-        float(validPoints)/points >= windowTolerance:
-
+      if validPoints > 0 and float(validPoints)/points >= windowTolerance:
         try:
           deviation = math.sqrt(validPoints * currentSumOfSquares - currentSum**2)/validPoints
         except ValueError:
@@ -4013,12 +4012,12 @@ def linearRegression(requestContext, seriesList, startSourceAt=None, endSourceAt
     series.tags['linearRegressions'] = '%s, %s' % (
       int(time.mktime(sourceContext['startTime'].timetuple())),
       int(time.mktime(sourceContext['endTime'].timetuple()))
-      )
+    )
     newName = 'linearRegression(%s, %s, %s)' % (
       series.name,
       int(time.mktime(sourceContext['startTime'].timetuple())),
       int(time.mktime(sourceContext['endTime'].timetuple()))
-      )
+    )
     forecast = linearRegressionAnalysis(source)
     if forecast is None:
       continue