update

celery_stats/es_status.py

@@ -72,8 +72,8 @@ def get_node_status(ip):
         cpu_1m = data["os"]["cpu"]["load_average"]['1m']
         cpu_5m = data["os"]["cpu"]["load_average"]['5m']
         cpu_15m = data["os"]["cpu"]["load_average"]['15m']
-        yong_gc = data["jvm"]["gc"]["collectors"]['yong']['collection_count']
-        yield node_name, ip, query_time, query_current, fetch_current, cpu_percent, cpu_1m, cpu_5m, cpu_15m, yong_gc
+        young_gc = data["jvm"]["gc"]["collectors"]['young']['collection_count']
+        yield node_name, ip, query_time, query_current, fetch_current, cpu_percent, cpu_1m, cpu_5m, cpu_15m, young_gc
 
 
 def parse_cluster_stats(data):
@@ -88,13 +88,13 @@ def parse_cluster_stats(data):
 
 def parse_node_stats(data):
     res_str = ""
-    node_name, ip, query_time, query_current, fetch_current, cpu_percent, cpu_1m, cpu_5m, cpu_15m, yong_gc = data
+    node_name, ip, query_time, query_current, fetch_current, cpu_percent, cpu_1m, cpu_5m, cpu_15m, young = data
     if cpu_1m >= cpu_top or cpu_5m >= cpu_top or cpu_15m >= cpu_top:
         res_str += "{name}节点CPU使用率预警 1m {cpu_1m} 5m {cpu_5m} 15m {cpu_15m} \n" \
                    "目前 query_current为{query_current} fetch_current为{fetch_current} yong_gc为{yong_gc}".format(cpu_1m=str(int(cpu_1m*100))+"%",name=node_name,
                                                                              cpu_5m=str(int(cpu_5m*100))+"%",
                                                                              cpu_15m= str(int(cpu_15m*100))+"%",
-                   query_current=str(query_current),fetch_current=str(fetch_current),yong_gc=str(yong_gc))
+                   query_current=str(query_current),fetch_current=str(fetch_current),young_gc=str(young))
     return res_str