diff --git a/config/system_config.tpl b/config/system_config.tpl
index 2e1d7811..0f8b93f8 100644
--- a/config/system_config.tpl
+++ b/config/system_config.tpl
@@ -2,6 +2,7 @@
 elasticsearch:
   - id: $[[CLUSTER_ID]]
     name: $[[CLUSTER_ID]]
+    version: $[[CLUSTER_VER]]
     enabled: true
     monitored: true
     reserved: true
diff --git a/plugin/api/insight/metric_util.go b/plugin/api/insight/metric_util.go
index aa26e5d9..cf2b63d7 100644
--- a/plugin/api/insight/metric_util.go
+++ b/plugin/api/insight/metric_util.go
@@ -76,6 +76,11 @@ func GenerateQuery(metric *insight.Metric) (interface{}, error) {
 		}
 	}
 	targetESVersion := elastic.GetMetadata(metric.ClusterId).Config.Version
+
+	if targetESVersion==""{
+		panic("invalid version")
+	}
+
 	intervalField, err := elastic.GetDateHistogramIntervalField(targetESVersion, metric.BucketSize)
 	if err != nil {
 		return nil, fmt.Errorf("get interval field error: %w", err)
diff --git a/plugin/setup/setup.go b/plugin/setup/setup.go
index b21145ec..a4885128 100644
--- a/plugin/setup/setup.go
+++ b/plugin/setup/setup.go
@@ -250,15 +250,17 @@ func (module *Module) initTempClient(r *http.Request) (error, elastic.API,SetupR
 
 	cfg.ID = tempID
 	cfg.Name = "INFINI_SYSTEM ("+util.PickRandomName()+")"
-	elastic.InitMetadata(&cfg, true)
+
 	client, err := elastic1.InitClientWithConfig(cfg)
 	if err != nil {
 		return err,nil,request
 	}
-
+	cfg.Version=client.GetVersion()
+	meta:=elastic.InitMetadata(&cfg, true)
+	meta.Config.Version=cfg.Version
+	elastic.SetMetadata(tempID,meta)
 	elastic.UpdateConfig(cfg)
 	elastic.UpdateClient(cfg, client)
-	cfg.Version=client.GetVersion()
 	global.Register(elastic.GlobalSystemElasticsearchID,tempID)
 
 	return err, client,request
@@ -440,8 +442,8 @@ func (module *Module) initialize(w http.ResponseWriter, r *http.Request, ps http
 	file:=path.Join(global.Env().GetConfigDir(),"system_config.yml")
 	_,err=util.FilePutContent(file,fmt.Sprintf("configs.template:\n  - name: \"system\"\n    path: ./config/system_config.tpl\n    variable:\n      " +
 		"CLUSTER_ID: %v\n      CLUSTER_ENDPINT: \"%v\"\n      " +
-		"CLUSTER_USER: \"%v\"\n      CLUSTER_PASS: \"%v\"\n      INDEX_PREFIX: \"%v\"",
-	tempID,cfg.Endpoint,cfg.BasicAuth.Username,cfg.BasicAuth.Password,cfg1.IndexPrefix	))
+		"CLUSTER_USER: \"%v\"\n      CLUSTER_PASS: \"%v\"\n      CLUSTER_VER: \"%v\"\n      INDEX_PREFIX: \"%v\"",
+	tempID,cfg.Endpoint,cfg.BasicAuth.Username,cfg.BasicAuth.Password,cfg.Version,cfg1.IndexPrefix	))
 	if err!=nil{
 		panic(err)
 	}
diff --git a/service/alerting/elasticsearch/engine.go b/service/alerting/elasticsearch/engine.go
index 8aeb8363..81dfd1cf 100644
--- a/service/alerting/elasticsearch/engine.go
+++ b/service/alerting/elasticsearch/engine.go
@@ -62,6 +62,11 @@ func (engine *Engine) GenerateQuery(rule *alerting.Rule, filterParam *alerting.F
 	if filterParam != nil && filterParam.BucketSize != "" {
 		periodInterval =  filterParam.BucketSize
 	}
+
+	if targetESVersion==""{
+		panic("invalid version")
+	}
+
 	intervalField, err := elastic.GetDateHistogramIntervalField(targetESVersion, periodInterval )
 	if err != nil {
 		return nil, fmt.Errorf("get interval field error: %w", err)