diff --git a/docs/linspector.lib.config.filters-module.html b/docs/linspector.lib.config.filters-module.html
deleted file mode 100644
index 703ff7d..0000000
--- a/docs/linspector.lib.config.filters-module.html
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
-
- linspector.lib.config.filters
- Module filters source code
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.config.filters-pysrc.html b/docs/linspector.lib.config.filters-pysrc.html
deleted file mode 100644
index db428ca..0000000
--- a/docs/linspector.lib.config.filters-pysrc.html
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
- linspector.lib.config.filters
-
-
2 - def __init__ ( self , name = "" , command = "" , priority = 0 , comment = "" ) :
-
3 self . name = name
-
4 self . command = command
-
5 self . priority = priority
-
6 self . comment = comment
-
7
-
9 return "Filter('Name: " + self . name + "', 'Command: " + self . command + "', 'Priority: " + str (
-
10 self . priority ) + "')"
-
11
-
13 return Filter ( self . name , self . command , self . priority , self . comment )
-
14
-15
-
17 return [ Filter ( name , ** values ) for name , values in filters . items ( ) ]
-
18
-
-linspector.lib.config.filters.Filter
- Class Filter source code
-
-
-
-
-
-
-
-
-
- __init__ (self ,
- name =''command =''priority =0 ,
- comment =''
- source code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.parser-module.html b/docs/linspector.lib.parser-module.html
deleted file mode 100644
index ca1fc3a..0000000
--- a/docs/linspector.lib.parser-module.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
- linspector.lib.parser
- Package parser source code
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.parser-pysrc.html b/docs/linspector.lib.parser-pysrc.html
deleted file mode 100644
index fe2429e..0000000
--- a/docs/linspector.lib.parser-pysrc.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
- linspector.lib.parser
-
-1
-2
-
-linspector.lib.parser.parser
- Module parser source code
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.parser.parser-pysrc.html b/docs/linspector.lib.parser.parser-pysrc.html
deleted file mode 100644
index 4260d07..0000000
--- a/docs/linspector.lib.parser.parser-pysrc.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
- linspector.lib.parser.parser
-
-1
-2
-
-linspector.lib.service
- Package service source code
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.service-pysrc.html b/docs/linspector.lib.service-pysrc.html
deleted file mode 100644
index b5bd04a..0000000
--- a/docs/linspector.lib.service-pysrc.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
- linspector.lib.service
-
-1
-2
-
-linspector.lib.service.htmlcontent
- Module htmlcontent source code
-The htmlcontent service in pure Python. STUPID NAME!!!
-
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.service.htmlcontent-pysrc.html b/docs/linspector.lib.service.htmlcontent-pysrc.html
deleted file mode 100644
index 476d45f..0000000
--- a/docs/linspector.lib.service.htmlcontent-pysrc.html
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
- linspector.lib.service.htmlcontent
-
- 1 """ 2 The htmlcontent service in pure Python. STUPID NAME!!! 3 """ 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-
-linspector.lib.service.ping
- Module ping source code
-The ping service in pure Python.
-
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.service.ping-pysrc.html b/docs/linspector.lib.service.ping-pysrc.html
deleted file mode 100644
index eb546c8..0000000
--- a/docs/linspector.lib.service.ping-pysrc.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
- linspector.lib.service.ping
-
-1 """ 2 The ping service in pure Python. 3 """ 4
-5
-6
-
-linspector.lib.service.snmpget
- Module snmpget source code
-The snmpget service in pure Python.
-
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.service.snmpget-pysrc.html b/docs/linspector.lib.service.snmpget-pysrc.html
deleted file mode 100644
index 33c2c91..0000000
--- a/docs/linspector.lib.service.snmpget-pysrc.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
- linspector.lib.service.snmpget
-
-1 """ 2 The snmpget service in pure Python. 3 """ 4
-5
-6
-
-linspector.lib.service.ssh
- Module ssh source code
-The ssh service in pure Python.
-
-
-
-
-
-
-
-
- __package__ = None
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/linspector.lib.service.ssh-pysrc.html b/docs/linspector.lib.service.ssh-pysrc.html
deleted file mode 100644
index 7885e13..0000000
--- a/docs/linspector.lib.service.ssh-pysrc.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
- linspector.lib.service.ssh
-
-1 """ 2 The ssh service in pure Python. 3 """ 4
-5
-6
-
-linspector.lib.service.tcpconnect
- Module tcpconnect source code
-The tcpconnect service in pure Python.
-
-
-
-
-
-
-
-
- HOST = 'linspector.org'
-
-
-
-
-
- GET = '/index.html'
-
-
-
-
-
- PORT = 80
-
-
-
-
-
-
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-
-
-
-
-
-
- data = ''
-
-
-
-
-
- string = 'HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nAccept...
-
-
-
-
-
- __package__ = 'linspector.lib.service'
-
-
-
-
-
-
- string
-
-
-
-
- Value:
-
-'''HTTP/1.0 200 OK\r
-Content-Type: text/html\r
-Accept-Ranges: bytes\r
-ETag: "2586394804"\r
-Last-Modified: Thu, 30 May 2013 02:05:45 GMT\r
-Content-Length: 6366\r
-Connection: close\r
-Date: Thu, 30 May 2013 02:55:06 GMT\r
-...
-
-
-
-
linspector.lib.service.tcpconnect
-
- 1 """ 2 The tcpconnect service in pure Python. 3 """ 4
- 5 import socket 6 import sys 7
- 8 HOST = 'linspector.org' 9 GET = '/index.html' 10 PORT = 80 11
-12 try : 13 sock = socket . socket ( socket . AF_INET , socket . SOCK_STREAM )
-14 except socket . error , msg : 15 sys . stderr . write ( "[ERROR] %s\n" % msg [ 1 ] )
-16 sys . exit ( 1 )
-17
-18 try : 19 sock . connect ( ( HOST , PORT ) )
-20 except socket . error , msg : 21 sys . stderr . write ( "[ERROR] %s\n" % msg [ 1 ] )
-22 sys . exit ( 2 )
-23
-24 sock . send ( "GET %s HTTP/1.0\r\nHost: %s\r\n\r\n" % ( GET , HOST ) ) 25
-26 data = sock . recv ( 1024 ) 27 string = "" 28 while len ( data ) : 29 string = string + data
-30 data = sock . recv ( 1024 )
-31 sock . close ( ) 32
-33 print string 34
-
-filters
- Module filters
-Classes
- Filter Functions
- parseFilterList Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.parser-module.html b/docs/toc-linspector.lib.parser-module.html
deleted file mode 100644
index 521ddea..0000000
--- a/docs/toc-linspector.lib.parser-module.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- parser
- Module parser
-Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.parser.parser-module.html b/docs/toc-linspector.lib.parser.parser-module.html
deleted file mode 100644
index 441a1ce..0000000
--- a/docs/toc-linspector.lib.parser.parser-module.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- parser
- Module parser
-Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.service-module.html b/docs/toc-linspector.lib.service-module.html
deleted file mode 100644
index 6bb1ae4..0000000
--- a/docs/toc-linspector.lib.service-module.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- service
- Module service
-Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.service.htmlcontent-module.html b/docs/toc-linspector.lib.service.htmlcontent-module.html
deleted file mode 100644
index 726c1a7..0000000
--- a/docs/toc-linspector.lib.service.htmlcontent-module.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- htmlcontent
- Module htmlcontent
-Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.service.ping-module.html b/docs/toc-linspector.lib.service.ping-module.html
deleted file mode 100644
index 2d268dd..0000000
--- a/docs/toc-linspector.lib.service.ping-module.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- ping
- Module ping
-Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.service.snmpget-module.html b/docs/toc-linspector.lib.service.snmpget-module.html
deleted file mode 100644
index 8c0288c..0000000
--- a/docs/toc-linspector.lib.service.snmpget-module.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- snmpget
- Module snmpget
-Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.service.ssh-module.html b/docs/toc-linspector.lib.service.ssh-module.html
deleted file mode 100644
index c7da0ab..0000000
--- a/docs/toc-linspector.lib.service.ssh-module.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- ssh
- Module ssh
-Variables
- __package__ [hide private ]
-
-
-
-
diff --git a/docs/toc-linspector.lib.service.tcpconnect-module.html b/docs/toc-linspector.lib.service.tcpconnect-module.html
deleted file mode 100644
index 3d36a3c..0000000
--- a/docs/toc-linspector.lib.service.tcpconnect-module.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- tcpconnect
- Module tcpconnect
-Variables
- GET HOST PORT __package__ data sock string [hide private ]
-
-
-
-
diff --git a/lib/parsers/shell.py b/lib/parsers/shell.py
new file mode 100644
index 0000000..15d5bf9
--- /dev/null
+++ b/lib/parsers/shell.py
@@ -0,0 +1,6 @@
+from parser import Parser
+
+
+class ShellParser(Parser):
+ def __init__(self):
+ pass
\ No newline at end of file
diff --git a/lib/processors/mariadb.py b/lib/processors/mariadb.py
new file mode 100644
index 0000000..f8094ec
--- /dev/null
+++ b/lib/processors/mariadb.py
@@ -0,0 +1,14 @@
+"""
+The MariaDB processor
+"""
+
+from processor import Processor
+
+
+class MariadbProcessor(Processor):
+ def __init__(self):
+ pass
+
+
+def create(kwargs):
+ return MariadbProcessor(**kwargs)
\ No newline at end of file
diff --git a/lib/processors/mongodb.py b/lib/processors/mongodb.py
index c94c84c..8b9d579 100644
--- a/lib/processors/mongodb.py
+++ b/lib/processors/mongodb.py
@@ -5,10 +5,10 @@ The MongoDB processor
from processor import Processor
-class Mongodb(Processor):
+class MongodbProcessor(Processor):
def __init__(self):
pass
def create(kwargs):
- return Mongodb(**kwargs)
\ No newline at end of file
+ return MongodbProcessor(**kwargs)
\ No newline at end of file
diff --git a/lib/processors/syslog.py b/lib/processors/syslog.py
index c75e158..645b488 100644
--- a/lib/processors/syslog.py
+++ b/lib/processors/syslog.py
@@ -5,10 +5,10 @@ The syslog processor
from processor import Processor
-class Syslog(Processor):
+class SyslogProcessor(Processor):
def __init__(self):
pass
def create(kwargs):
- return Syslog(**kwargs)
\ No newline at end of file
+ return SyslogProcessor(**kwargs)
\ No newline at end of file
diff --git a/linspector.json b/linspector.json
index b0d6794..aae9209 100644
--- a/linspector.json
+++ b/linspector.json
@@ -40,6 +40,10 @@
{
"class": "syslog",
"args":{ "host": "syslog.linspector.org", "user": "syslog", "password": "secret" }
+ },
+ {
+ "class": "mariadb",
+ "args":{ "host": "mariadb.linspector.org", "port": "3306", "user": "maria", "password": "secret", "database": "linspector" }
}
],
"services":[