Skip to content

feat(tags): Allow tags to be configured #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
respectus merged 1 commit into from
Apr 17, 2018
Merged

feat(tags): Allow tags to be configured #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,15 @@ The default level passed along with every log sent through this instance.
By default the line has a maximum length of 16000 chars, this can be turned off with the value false.


##### tags

* _Optional_
* Type: `String[]`
* Default: `[]`

List of tags used to dynamically group hosts. More information on tags is available at [How Do I Use Host Tags?](https://docs.logdna.com/docs/logdna-agent#section-how-do-i-use-host-tags-)


### log(line, [options])
---
#### line
Expand Down
15 changes: 14 additions & 1 deletion logdna/logdna.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def __init__(self, key, options={}):
self.env = options['env'] if 'env' in options else ''
self.setLevel(logging.DEBUG)

self.tags = []
if 'tags' in options and isinstance(options['tags'], list):
self.tags.extend(options['tags'])
self.max_length = True
if 'max_length' in options:
self.max_length = options['max_length']
Expand Down Expand Up @@ -71,7 +74,17 @@ def flush(self):
self.flusher = Timer(defaults['FLUSH_NOW'], self.flush)
self.flusher.start()
else:
resp = requests.post(url=defaults['LOGDNA_URL'], json=data, auth=('user', self.key), params={ 'hostname': self.hostname, 'ip': self.ip, 'mac': self.mac if self.mac else None }, stream=True, timeout=defaults['MAX_REQUEST_TIMEOUT'])
resp = requests.post(
url=defaults['LOGDNA_URL'],
json=data,
auth=('user', self.key),
params={
'hostname': self.hostname,
'ip': self.ip,
'mac': self.mac if self.mac else None,
'tags': self.tags if self.tags else None},
stream=True,
timeout=defaults['MAX_REQUEST_TIMEOUT'])
self.buf = []
self.bufByteLength = 0
if self.flusher:
Expand Down