mirror of https://github.com/jumpserver/jumpserver
fix: 不支持es8 提示
parent
33090c4cdf
commit
c2fbe5c75a
|
@ -1,3 +1,3 @@
|
||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:843b6dffe6af09073053e21f65be4c8264e6dee05509b375c8191dde8c9079b6
|
oid sha256:5effe3cb5eb97d51bf886d21dfbe785bb789722f30774a6595eac7aa79b6315a
|
||||||
size 127386
|
size 127478
|
||||||
|
|
|
@ -4651,6 +4651,10 @@ msgstr "ターミナル管理"
|
||||||
msgid "Invalid elasticsearch config"
|
msgid "Invalid elasticsearch config"
|
||||||
msgstr "無効なElasticsearch構成"
|
msgstr "無効なElasticsearch構成"
|
||||||
|
|
||||||
|
#: terminal/backends/command/es.py:33
|
||||||
|
msgid "Not Support Elasticsearch8"
|
||||||
|
msgstr "サポートされていません Elasticsearch8"
|
||||||
|
|
||||||
#: terminal/backends/command/models.py:16
|
#: terminal/backends/command/models.py:16
|
||||||
msgid "Ordinary"
|
msgid "Ordinary"
|
||||||
msgstr "普通"
|
msgstr "普通"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a78975a5a6669bfcc0f99bc4d47811be82a0620e873e51e4a17d06548e3b1e7f
|
oid sha256:d30f8d3abc215c35bb2dd889374eeef896a193f8010ccd5ae8e27aa408f045c7
|
||||||
size 105269
|
size 105337
|
||||||
|
|
|
@ -4579,6 +4579,10 @@ msgstr "终端管理"
|
||||||
msgid "Invalid elasticsearch config"
|
msgid "Invalid elasticsearch config"
|
||||||
msgstr "无效的 Elasticsearch 配置"
|
msgstr "无效的 Elasticsearch 配置"
|
||||||
|
|
||||||
|
#: terminal/backends/command/es.py:33
|
||||||
|
msgid "Not Support Elasticsearch8"
|
||||||
|
msgstr "不支持 Elasticsearch8"
|
||||||
|
|
||||||
#: terminal/backends/command/models.py:16
|
#: terminal/backends/command/models.py:16
|
||||||
msgid "Ordinary"
|
msgid "Ordinary"
|
||||||
msgstr "普通"
|
msgstr "普通"
|
||||||
|
|
|
@ -28,6 +28,11 @@ class InvalidElasticsearch(JMSException):
|
||||||
default_detail = _('Invalid elasticsearch config')
|
default_detail = _('Invalid elasticsearch config')
|
||||||
|
|
||||||
|
|
||||||
|
class NotSupportElasticsearch8(JMSException):
|
||||||
|
default_code = 'not_support_elasticsearch8'
|
||||||
|
default_detail = _('Not Support Elasticsearch8')
|
||||||
|
|
||||||
|
|
||||||
class CommandStore(object):
|
class CommandStore(object):
|
||||||
def __init__(self, config):
|
def __init__(self, config):
|
||||||
self.doc_type = config.get("DOC_TYPE") or '_doc'
|
self.doc_type = config.get("DOC_TYPE") or '_doc'
|
||||||
|
@ -68,13 +73,18 @@ class CommandStore(object):
|
||||||
if not self.ping(timeout=3):
|
if not self.ping(timeout=3):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
info = self.es.info()
|
||||||
|
version = info['version']['number'].split('.')[0]
|
||||||
|
|
||||||
|
if version == '8':
|
||||||
|
raise NotSupportElasticsearch8
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# 获取索引信息,如果没有定义,直接返回
|
# 获取索引信息,如果没有定义,直接返回
|
||||||
data = self.es.indices.get_mapping(self.index)
|
data = self.es.indices.get_mapping(self.index)
|
||||||
except NotFoundError:
|
except NotFoundError:
|
||||||
return False
|
return False
|
||||||
info = self.es.info()
|
|
||||||
version = info['version']['number'].split('.')[0]
|
|
||||||
try:
|
try:
|
||||||
if version == '6':
|
if version == '6':
|
||||||
# 检测索引是不是新的类型 es6
|
# 检测索引是不是新的类型 es6
|
||||||
|
|
Loading…
Reference in New Issue