github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: es6 create index fail

pull/8083/head
feng626 2022-04-18 18:45:38 +08:00 committed by Jiangjie.Bai
parent 4362f8d5af
commit fe47e40588
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
apps/terminal/backends/command/es.py
View File

@ -59,10 +59,15 @@ class CommandStore(object):
data = self.es.indices.get_mapping(self.index)
except NotFoundError:
return False
info = self.es.info()
version = info['version']['number'].split('.')[0]
try:
# 检测索引是不是新的类型
properties = data[self.index]['mappings']['properties']
if version == '6':
# 检测索引是不是新的类型 es6
properties = data[self.index]['mappings']['data']['properties']
else:
# 检测索引是不是新的类型 es7 default index type: _doc
properties = data[self.index]['mappings']['properties']
if properties['session']['type'] == 'keyword' \
and properties['org_id']['type'] == 'keyword':
return True
@ -75,27 +80,30 @@ class CommandStore(object):
self._ensure_index_exists()
def _ensure_index_exists(self):
mappings = {
"mappings": {
"properties": {
"session": {
"type": "keyword"
},
"org_id": {
"type": "keyword"
},
"@timestamp": {
"type": "date"
},
"timestamp": {
"type": "long"
}
}
properties = {
"session": {
"type": "keyword"
},
"org_id": {
"type": "keyword"
},
"@timestamp": {
"type": "date"
},
"timestamp": {
"type": "long"
}
}
info = self.es.info()
version = info['version']['number'].split('.')[0]
if version == '6':
mappings = {'mappings': {'data': {'properties': properties}}}
else:
mappings = {'mappings': {'properties': properties}}
try:
self.es.indices.create(self.index, body=mappings)
return
except RequestError as e:
logger.exception(e)