Permalink
Browse files

Implement counter submission from the dog cli

Also add a rake lint target.
  • Loading branch information...
1 parent ffc8fbd commit 241902d3ff9148cb40566eec7b2ec5708cf8eaae @alq666 alq666 committed Aug 15, 2013
Showing with 546 additions and 269 deletions.
  1. +249 −0 .pylintrc
  2. +1 −1 README → README.md
  3. +6 −0 Rakefile.rb
  4. +1 −1 setup.py
  5. +9 −0 src/dogapi/common.py
  6. +1 −1 src/dogshell/__init__.py
  7. +1 −2 src/dogshell/common.py
  8. +11 −5 src/dogshell/metric.py
  9. +267 −259 tests/integration/test_dogshell.py
View
249 .pylintrc
@@ -0,0 +1,249 @@
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Profiled execution.
+profile=no
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS,.git
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once).
+disable=C0301, C0103, C0111, C0321
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html
+output-format=colorized
+
+# Include message's id in output
+include-ids=yes
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (RP0004).
+comment=no
+
+
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=input
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Regular expression which should only match functions or classes name which do
+# not require a docstring
+no-docstring-rgx=__.*__
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=132
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string=' '
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed. Python regular
+# expressions are accepted.
+generated-members=REQUEST,acl_users,aq_parent
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=_|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=10
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branchs=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
View
@@ -6,7 +6,7 @@ A Python client for the DataDog API.
- Library Documentation: http://pydoc.datadoghq.com
- HTTP API Documetation: http://api.datadoghq.com/
- DataDogHQ: http://datadoghq.com
-
+- Code: https://github.com/DataDog/dogapi ([![Build Status](https://travis-ci.org/DataDog/dogapi.png?branch=fabric)](https://travis-ci.org/DataDog/dogapi))
Change Log
----------
View
@@ -29,6 +29,12 @@
sh "python setup.py egg_info -b '_#{build_number}' bdist_egg"
end
+desc "Run the code through pylint"
+task :lint do
+ sh "find src/dogapi -name '*.py' -type f -exec pylint --rcfile=.pylintrc --reports=n --output-format=colorized {} ';'"
+ sh "find src/dogshell -name '*.py' -type f -exec pylint --rcfile=.pylintrc --reports=n --output-format=colorized {} ';'"
+end
+
namespace :test do
desc "Run integration tests."
View
@@ -11,7 +11,7 @@
setup(
name = "dogapi",
- version = "1.4.0",
+ version = "1.4.1",
packages = find_packages("src"),
package_dir = {'':'src'},
author = "Datadog, Inc.",
View
@@ -33,4 +33,13 @@ def get_ec2_instance_id():
except:
return socket.gethostname()
+memoized_hostname = None
+def find_localhost():
+ try:
+ global memoized_hostname
+ if memoized_hostname is None:
+ memoized_hostname = socket.getfqdn()
+ return memoized_hostname
+ except Exception, e:
+ logging.exception("Cannot determine local hostname")
View
@@ -49,5 +49,5 @@ def main():
args.func(args)
-if __name__=='__main__':
+if __name__ == '__main__':
main()
View
@@ -1,5 +1,5 @@
from __future__ import print_function
-from dogapi.common import is_p3k
+from dogapi.common import is_p3k, find_localhost
get_input = input
@@ -51,7 +51,6 @@ def dog(self):
return self._dog
-
class DogshellConfig(IterableUserDict):
def load(self, config_file, apikey, appkey):
View
@@ -1,7 +1,5 @@
-import time, datetime
-import socket
-
-from dogshell.common import report_errors, report_warnings, CommandLineClient
+from dogshell.common import report_errors, report_warnings, CommandLineClient, find_localhost
+from dogapi.constants import MetricType
class MetricClient(CommandLineClient):
@@ -16,8 +14,10 @@ def setup_parser(self, subparsers):
post_parser.add_argument('--device', help='scopes your metric to a specific device', default=None)
post_parser.add_argument('--tags', help='comma-separated list of tags', default=None)
post_parser.add_argument('--localhostname', help='same as --host=`hostname` (overrides --host)', action='store_true')
+ post_parser.add_argument('--counter', help='submit value as a uint64 counter instead of gauge', action='store_false')
parser.set_defaults(func=self._post)
+
def _post(self, args):
self.dog.timeout = args.timeout
if args.localhostname:
@@ -29,7 +29,13 @@ def _post(self, args):
args.tags.split(',') if t]))
else:
tags = None
+
+ # are we sending a counter?
+ if args.counter:
+ metric_type = MetricType.Counter
+ else:
+ metric_type = MetricType.Gauge
res = self.dog.metric(args.name, args.value, host=host,
- device=args.device, tags=tags)
+ device=args.device, tags=tags, metric_type=metric_type)
report_warnings(res)
report_errors(res)
Oops, something went wrong.

0 comments on commit 241902d

Please sign in to comment.