elasticsearch 2.x compatibility, bump version number
This commit is contained in:
parent
7bd23394e3
commit
ec819b2cad
|
@ -4,3 +4,4 @@ examples/config.test.json
|
||||||
build
|
build
|
||||||
dist
|
dist
|
||||||
pymonitor.egg-info
|
pymonitor.egg-info
|
||||||
|
testenv
|
||||||
|
|
|
@ -96,3 +96,10 @@ Roadmap
|
||||||
* Complete API docs
|
* Complete API docs
|
||||||
* More builtin monitors
|
* More builtin monitors
|
||||||
* Local logging in case ES can't be reached
|
* Local logging in case ES can't be reached
|
||||||
|
|
||||||
|
Changelog
|
||||||
|
---------
|
||||||
|
|
||||||
|
*0.1.0:* renamed fields with names containing dots for elasticsearch 2.0 compatibility
|
||||||
|
*0.0.1:* initial release!
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
__version__ = "0.0.1"
|
__version__ = "0.1.0"
|
||||||
|
|
|
@ -82,7 +82,7 @@ class Backend:
|
||||||
Fetch generic system info that is sent with every piece of monitoring data
|
Fetch generic system info that is sent with every piece of monitoring data
|
||||||
"""
|
"""
|
||||||
self.sysinfo["hostname"] = sysinfo.hostname()
|
self.sysinfo["hostname"] = sysinfo.hostname()
|
||||||
self.sysinfo["hostname.raw"] = self.sysinfo["hostname"]
|
self.sysinfo["hostname_raw"] = self.sysinfo["hostname"]
|
||||||
self.sysinfo["ipaddr"] = sysinfo.ipaddr()
|
self.sysinfo["ipaddr"] = sysinfo.ipaddr()
|
||||||
|
|
||||||
def get_index_name(self):
|
def get_index_name(self):
|
||||||
|
@ -106,7 +106,7 @@ class Backend:
|
||||||
"hostname": {
|
"hostname": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"hostname.raw": {
|
"hostname_raw": {
|
||||||
"type" : "string",
|
"type" : "string",
|
||||||
"index" : "not_analyzed"
|
"index" : "not_analyzed"
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ def diskio(disks=[]):
|
||||||
continue
|
continue
|
||||||
stats = {
|
stats = {
|
||||||
"disk": disk,
|
"disk": disk,
|
||||||
"disk.raw": disk,
|
"disk_raw": disk,
|
||||||
"reads_ps": round(stats.read_count/uptime, 2),
|
"reads_ps": round(stats.read_count/uptime, 2),
|
||||||
"writes_ps":round(stats.write_count/uptime, 2),
|
"writes_ps":round(stats.write_count/uptime, 2),
|
||||||
"read_ps": round(stats.read_bytes/uptime, 2),
|
"read_ps": round(stats.read_bytes/uptime, 2),
|
||||||
|
@ -31,7 +31,7 @@ mapping = {
|
||||||
"disk": {
|
"disk": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"disk.raw": {
|
"disk_raw": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"index" : "not_analyzed"
|
"index" : "not_analyzed"
|
||||||
},
|
},
|
||||||
|
|
|
@ -6,7 +6,7 @@ def diskspace(filesystems=[]):
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
"fs": fs,
|
"fs": fs,
|
||||||
"fs.raw": fs,
|
"fs_raw": fs,
|
||||||
"diskfree": stats.f_bsize * stats.f_bavail,
|
"diskfree": stats.f_bsize * stats.f_bavail,
|
||||||
"diskused": (stats.f_blocks-stats.f_bavail) * stats.f_bsize,
|
"diskused": (stats.f_blocks-stats.f_bavail) * stats.f_bsize,
|
||||||
"disksize": stats.f_bsize * stats.f_blocks,
|
"disksize": stats.f_bsize * stats.f_blocks,
|
||||||
|
@ -44,7 +44,7 @@ mapping = {
|
||||||
"fs": {
|
"fs": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"fs.raw": {
|
"fs_raw": {
|
||||||
"type" : "string",
|
"type" : "string",
|
||||||
"index" : "not_analyzed"
|
"index" : "not_analyzed"
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
elasticsearch==2.1.0
|
elasticsearch==2.2.0
|
||||||
psutil==3.3.0
|
psutil==3.3.0
|
||||||
PyYAML==3.11
|
PyYAML==3.11
|
||||||
|
|
Loading…
Reference in New Issue