Просмотр исходного кода

fix(rule_engine_metrics): add more rulge_engine version to emqx_rule_engine.appup.src

EMQ-YangM 4 лет назад
Родитель
Сommit
3956eaddd7

+ 38 - 12
apps/emqx_rule_engine/src/emqx_rule_engine.appup.src

@@ -1,52 +1,78 @@
 %% -*- mode: erlang -*-
 {VSN,
-  [{"4.3.5",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
+  [{"4.3.7",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
    {"4.3.0",
-    [{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.0"]}},
+     {load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
      {apply,{emqx_stats,cancel_update,[rule_registery_stats]}},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.1",
-    [{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.1"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
      {apply,{emqx_stats,cancel_update,[rule_registery_stats]}},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.2",
-    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.2"]}},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
      {apply,{emqx_stats,cancel_update,[rule_registery_stats]}},
      {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.3",
-    [{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.3"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
    {"4.3.4",
-    [{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.4"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
+   {"4.3.5",
+    [{update, emqx_rule_metrics, {advanced, ["4.3.5"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
+   {"4.3.6",
+    [{update, emqx_rule_metrics, {advanced, ["4.3.6"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.3.5",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
+  [{"4.3.7",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
    {"4.3.0",
-    [{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.0"]}},
+     {load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
      {apply,{emqx_stats,cancel_update,[rule_registery_stats]}},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.1",
-    [{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.1"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
      {apply,{emqx_stats,cancel_update,[rule_registery_stats]}},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.2",
-    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.2"]}},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
      {apply,{emqx_stats,cancel_update,[rule_registery_stats]}},
      {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.3",
-    [{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.3"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_actions,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
    {"4.3.4",
-    [{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+    [{update, emqx_rule_metrics, {advanced, ["4.3.4"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
+   {"4.3.5",
+    [{update, emqx_rule_metrics, {advanced, ["4.3.5"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
+   {"4.3.6",
+    [{update, emqx_rule_metrics, {advanced, ["4.3.6"]}},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}]}.

+ 2 - 2
apps/emqx_rule_engine/src/emqx_rule_metrics.erl

@@ -348,7 +348,7 @@ handle_info(ticking, State = #state{rule_speeds = RuleSpeeds0,
 handle_info(_Info, State) ->
     {noreply, State}.
 
-code_change({down, Vsn}, State = #state{metric_ids = MIDs}, _Extra)
+code_change({down, _Vsn}, State = #state{metric_ids = MIDs}, [Vsn])
         when Vsn =:= "4.3.0";
              Vsn =:= "4.3.1";
              Vsn =:= "4.3.2";
@@ -374,7 +374,7 @@ code_change({down, Vsn}, State = #state{metric_ids = MIDs}, _Extra)
     end || Id <- sets:to_list(MIDs)],
     {ok, State};
 
-code_change(Vsn, State = #state{metric_ids = MIDs}, _Extra)
+code_change(_Vsn, State = #state{metric_ids = MIDs}, [Vsn])
         when Vsn =:= "4.3.0";
              Vsn =:= "4.3.1";
              Vsn =:= "4.3.2";