chore: updating monitor state api

infinilabs · Dec 12, 2024 · a44db63 · a44db63
1 parent 7c9badc
commit a44db63
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/modules/elastic/api/cluster_overview.go b/modules/elastic/api/cluster_overview.go
@@ -1376,22 +1376,36 @@ func (h *APIHandler) getClusterMonitorState(w http.ResponseWriter, req *http.Req
 		h.WriteError(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	lastActiveAt := util.MapStr{}
 	for _, bk := range response.Aggregations["grp_name"].Buckets {
 		key := bk["key"].(string)
 		if tv, ok := bk["max_timestamp"].(map[string]interface{}); ok {
 			if collectionMode == elastic.ModeAgentless {
 				if util.StringInArray([]string{ "index_stats", "cluster_health", "cluster_stats", "node_stats"}, key) {
-					lastActiveAt[key] = tv["value"]
+					ret[key] = getCollectionStats(tv["value"])
 				}
 			}else{
 				if util.StringInArray([]string{ "shard_stats", "cluster_health", "cluster_stats", "node_stats"}, key) {
-					lastActiveAt[key] = tv["value"]
+					ret[key] = getCollectionStats(tv["value"])
 				}
 			}
 		}
 
 	}
-	ret["last_active_at"] = lastActiveAt
 	h.WriteJSON(w, ret, http.StatusOK)
+}
+
+func getCollectionStats(lastActiveAt interface{}) util.MapStr {
+	stats := util.MapStr{
+		"last_active_at": lastActiveAt,
+		"status": "active",
+	}
+	if timestamp, ok := lastActiveAt.(float64); ok {
+		t := time.Unix(int64(timestamp/1000), 0)
+		if time.Now().Sub(t) > 5 * time.Minute {
+			stats["status"] = "warning"
+		}else{
+			stats["status"] = "ok"
+		}
+	}
+	return stats
 }
diff --git a/modules/elastic/api/init.go b/modules/elastic/api/init.go
@@ -86,7 +86,7 @@ func init() {
 	api.HandleAPIMethod(api.POST, "/elasticsearch/cluster/info", clusterAPI.RequirePermission(clusterAPI.FetchClusterInfo, enum.PermissionElasticsearchMetricRead))
 
 	api.HandleAPIMethod(api.GET, "/elasticsearch/:id/info", clusterAPI.RequireClusterPermission(clusterAPI.RequirePermission(clusterAPI.GetClusterInfo, enum.PermissionElasticsearchMetricRead)))
-	api.HandleAPIMethod(api.GET, "/elasticsearch/:id/monitor_state", clusterAPI.RequireClusterPermission(clusterAPI.RequirePermission(clusterAPI.getClusterMonitorState, enum.PermissionElasticsearchMetricRead)))
+	api.HandleAPIMethod(api.GET, "/elasticsearch/:id/_collection_stats", clusterAPI.RequireClusterPermission(clusterAPI.RequirePermission(clusterAPI.getClusterMonitorState, enum.PermissionElasticsearchMetricRead)))
 	api.HandleAPIMethod(api.POST, "/elasticsearch/node/_search", clusterAPI.RequirePermission(clusterAPI.SearchNodeMetadata, enum.PermissionElasticsearchNodeRead))
 	api.HandleAPIMethod(api.GET, "/elasticsearch/:id/nodes", clusterAPI.RequireClusterPermission(clusterAPI.RequirePermission(clusterAPI.GetClusterNodes, enum.PermissionElasticsearchMetricRead, enum.PermissionElasticsearchNodeRead)))
 	api.HandleAPIMethod(api.GET, "/elasticsearch/:id/nodes/realtime", clusterAPI.RequireClusterPermission(clusterAPI.RequirePermission(clusterAPI.GetRealtimeClusterNodes, enum.PermissionElasticsearchMetricRead)))