Merge b64df30 into aae6a5d

big_tests/tests/service_mongoose_system_metrics_SUITE.erl

@@ -47,7 +47,8 @@
          api_are_reported/1,
          transport_mechanisms_are_reported/1,
          outgoing_pools_are_reported/1,
-         xmpp_stanzas_counts_are_reported/1
+         xmpp_stanzas_counts_are_reported/1,
+         config_type_is_reported/1
         ]).
 
 -export([
@@ -87,6 +88,7 @@ all() ->
      transport_mechanisms_are_reported,
      outgoing_pools_are_reported,
      xmpp_stanzas_counts_are_reported,
+     config_type_is_reported,
      {group, log_transparency}
     ].
 
@@ -139,14 +141,6 @@ end_per_group(log_transparency, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-init_per_testcase(periodic_report_available, Config) ->
-    create_events_collection(),
-    enable_system_metrics(mim()),
-    Config;
-init_per_testcase(system_metrics_are_reported_to_google_analytics_when_mim_starts, Config) ->
-    create_events_collection(),
-    enable_system_metrics(mim()),
-    Config;
 init_per_testcase(system_metrics_are_not_reported_when_not_allowed, Config) ->
     create_events_collection(),
     disable_system_metrics(mim()),
@@ -187,17 +181,6 @@ init_per_testcase(_TestcaseName, Config) ->
     enable_system_metrics(mim()),
     Config.
 
-
-end_per_testcase(periodic_report_available, Config) ->
-    clear_events_collection(),
-    disable_system_metrics(mim()),
-    delete_prev_client_id(mim()),
-    Config;
-end_per_testcase(system_metrics_are_reported_to_google_analytics_when_mim_starts, Config) ->
-    clear_events_collection(),
-    delete_prev_client_id(mim()),
-    disable_system_metrics(mim()),
-    Config;
 end_per_testcase(system_metrics_are_not_reported_when_not_allowed, Config) ->
     clear_events_collection(),
     delete_prev_client_id(mim()),
@@ -222,6 +205,7 @@ end_per_testcase(xmpp_stanzas_counts_are_reported = CN, Config) ->
 end_per_testcase(_TestcaseName, Config) ->
     clear_events_collection(),
     disable_system_metrics(mim()),
+    delete_prev_client_id(mim()),
     Config.
 
 
@@ -244,7 +228,6 @@ all_clustered_mongooses_report_the_same_client_id(_Config) ->
     mongoose_helper:wait_until(fun hosts_count_is_reported/0, true),
     all_event_have_the_same_client_id().
 
-
 system_metrics_are_reported_to_google_analytics_when_mim_starts(_Config) ->
     mongoose_helper:wait_until(fun hosts_count_is_reported/0, true),
     mongoose_helper:wait_until(fun modules_are_reported/0, true),
@@ -313,6 +296,9 @@ xmpp_stanzas_counts_are_reported(Config) ->
     mongoose_helper:wait_until(fun xmpp_messages_count_is_reported/0, true),
     mongoose_helper:wait_until(fun xmpp_stanzas_counts_are_reported/0, true).
 
+config_type_is_reported(_Config) ->
+    mongoose_helper:wait_until(fun config_type_is_reported/0, true).
+
 just_removed_from_config_logs_question(_Config) ->
     disable_system_metrics(mim3()),
     remove_service_from_config(service_mongoose_system_metrics),
@@ -483,6 +469,13 @@ feature_is_reported(EventCategory, EventAction) ->
             EC == EventCategory andalso EA == EventAction
         end, Tab).
 
+feature_is_reported(EventCategory, EventAction, EventLabel) ->
+    Tab = ets:tab2list(?ETS_TABLE),
+    lists:any(
+        fun(#event{ec = EC, ea = EA, el = EL}) ->
+            EC == EventCategory andalso EA == EventAction andalso EL == EventLabel
+        end, Tab).
+
 mod_vcard_backend_is_reported() ->
     feature_is_reported(<<"mod_vcard">>, <<"backend">>).
 
@@ -495,6 +488,11 @@ cluster_uptime_is_reported() ->
 xmpp_components_are_reported() ->
     feature_is_reported(<<"cluster">>, <<"number_of_components">>).
 
+config_type_is_reported() ->
+    IsToml = feature_is_reported(<<"cluster">>, <<"config_type">>, <<"toml">>),
+    IsCfg = feature_is_reported(<<"cluster">>, <<"config_type">>, <<"cfg">>),
+    IsToml orelse IsCfg.
+
 api_are_reported() ->
     is_in_table(<<"http_api">>).
 

src/ejabberd_config.erl

@@ -46,7 +46,8 @@
 -export([print_flat_config/0]).
 
 -export([get_local_config/0,
-         get_host_local_config/0]).
+         get_host_local_config/0,
+         get_config_path/0]).
 
 %% Introspection
 -export([config_info/0]).

src/system_metrics/mongoose_system_metrics_collector.erl

@@ -33,7 +33,8 @@ report_getters() ->
         fun get_api/0,
         fun get_transport_mechanisms/0,
         fun get_tls_options/0,
-        fun get_outgoing_pools/0
+        fun get_outgoing_pools/0,
+        fun get_config_type/0
     ].
 
 get_hosts_count() ->
@@ -215,3 +216,12 @@ calculate_stanza_rate(PrevReport, NewCount) ->
             undefined -> Count;
             Total -> Count-Total
         end} || {Type, Count} <- NewCount].
+
+get_config_type() ->
+    ConfigPath = ejabberd_config:get_config_path(),
+    ConfigType = case filename:extension(ConfigPath) of
+        ".toml" -> toml;
+        ".cfg" -> cfg;
+        _ -> unknown_config_type
+    end,
+    [#{report_name => cluster, key => config_type, value => ConfigType}].