BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305941
Change subject: Add Logstash logging support
......................................................................
Add Logstash logging support
Add a 'logstash' handler that can be used to send JSON log events as UDP
datagrams to a logstash server. To enable it, add 'logstash' to your
logging.HANDLERS ini setting. Be sure to set logging.LOGSTASH_HOST and
LOGSTASH_PORT appropriately for your environment.
Change-Id: Id945177a4e95352cac61bc6a1439149367d37899
---
M requirements.txt
M striker/settings.py
M striker/striker.ini
3 files changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/striker
refs/changes/41/305941/1
diff --git a/requirements.txt b/requirements.txt
index 59bce63..8237269 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,6 +15,7 @@
pycparser>=2.14 # BSD
PyJWT>=1.4.0 # MIT
pyldap>=2.4.25.1 # Python style
+python-logstash>=0.4.6 # MIT
python-memcached>=1.58 # Python style
requests>=2.10.0 # Apache 2.0
requests-oauthlib>=0.6.1 # ISC
diff --git a/striker/settings.py b/striker/settings.py
index f68e473..45750e3 100644
--- a/striker/settings.py
+++ b/striker/settings.py
@@ -62,9 +62,27 @@
'formatter': 'line',
'level': 'DEBUG',
},
+ 'logstash': {
+ 'class': 'logstash.UDPLogstashHandler',
+ 'host': ini.get('logging', 'LOGSTASH_HOST'),
+ 'port': int(ini.get('logging', 'LOGSTASH_PORT')),
+ 'version': 1,
+ 'message_type': 'striker',
+ 'fqdn': False,
+ },
},
'loggers': {
'django': {
+ 'handlers': ini.get('logging', 'HANDLERS').split(),
+ 'level': ini.get('logging', 'LEVEL'),
+ 'propagate': False,
+ },
+ 'django.request': {
+ 'handlers': ini.get('logging', 'HANDLERS').split(),
+ 'level': ini.get('logging', 'LEVEL'),
+ 'propagate': False,
+ },
+ 'django.security': {
'handlers': ini.get('logging', 'HANDLERS').split(),
'level': ini.get('logging', 'LEVEL'),
'propagate': False,
@@ -79,6 +97,11 @@
'level': ini.get('logging', 'LEVEL'),
'propagate': False,
},
+ 'py.warnings': {
+ 'handlers': ini.get('logging', 'HANDLERS').split(),
+ 'level': ini.get('logging', 'LEVEL'),
+ 'propagate': False,
+ },
'ratelimitbackend': {
'handlers': ini.get('logging', 'HANDLERS').split(),
'level': ini.get('logging', 'LEVEL'),
diff --git a/striker/striker.ini b/striker/striker.ini
index ba60885..36ccf7f 100644
--- a/striker/striker.ini
+++ b/striker/striker.ini
@@ -84,6 +84,8 @@
HANDLERS = console
LEVEL = WARNING
FILE_FILENAME = /dev/null
+LOGSTASH_HOST = 127.0.0.1
+LOGSTASH_PORT = 11514
[user_session]
# TTL (in seconds) for a "remember me" login session
--
To view, visit https://gerrit.wikimedia.org/r/305941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id945177a4e95352cac61bc6a1439149367d37899
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
