diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua index 8eaecf571c..e47a41885a 100644 --- a/scripts/locales/en.lua +++ b/scripts/locales/en.lua @@ -2439,6 +2439,7 @@ local lang = { ["dumped_packets"] = "Dumped Packets", ["egress_packets"] = "Egress Packets", ["exported_flows"] = "Exported Flows", + ["export_disabled"] = "Flows Export Disabled in Runtime Preferences", ["family"] = "Family", ["flows_export_statistics"] = "Flows Export Statistics", ["has_traffic_directions"] = "with RX/TX Directions", diff --git a/scripts/lua/if_stats.lua b/scripts/lua/if_stats.lua index 79d63e0d0d..89fb184b84 100644 --- a/scripts/lua/if_stats.lua +++ b/scripts/lua/if_stats.lua @@ -707,7 +707,13 @@ if((page == "overview") or (page == nil)) then export_drops_pct = 100 end - print(""..dump_to.." "..i18n("if_stats_overview.flows_export_statistics").."\n") + print("") + if prefs.is_dump_flows_runtime_enabled then + print(dump_to.." "..i18n("if_stats_overview.flows_export_statistics")) + else + print(i18n("if_stats_overview.export_disabled")) + end + print("\n") print("") print(""..i18n("if_stats_overview.exported_flows")..ternary(charts_available, " ", "").."") @@ -733,7 +739,7 @@ if((page == "overview") or (page == nil)) then if not interface.isPacketInterface() then print(""..i18n("if_stats_overview.direct_mode").."") - print(""..ternary(prefs.is_direct_flow_dump_enabled, i18n("enabled"), i18n("disabled")).."") + print(""..ternary(prefs.is_dump_flows_direct_enabled, i18n("enabled"), i18n("disabled")).."") else print("") end diff --git a/src/Prefs.cpp b/src/Prefs.cpp index 774551e6ca..f9a9e00e2d 100755 --- a/src/Prefs.cpp +++ b/src/Prefs.cpp @@ -1709,16 +1709,20 @@ void Prefs::lua(lua_State* vm) { lua_push_uint64_table_entry(vm, "max_num_hosts", max_num_hosts); lua_push_uint64_table_entry(vm, "max_num_flows", max_num_flows); - lua_push_bool_table_entry(vm, "is_dump_flows_enabled", do_dump_flows()); - lua_push_bool_table_entry(vm, "is_dump_flows_to_mysql_enabled", dump_flows_on_mysql || read_flows_from_mysql); + lua_push_bool_table_entry(vm, "is_dump_flows_enabled", do_dump_flows()); + lua_push_bool_table_entry(vm, "is_dump_flows_runtime_enabled", is_runtime_flows_dump_enabled()); +#ifdef NTOPNG_PRO + lua_push_bool_table_entry(vm, "is_dump_flows_direct_enabled", do_dump_flows_direct()); +#endif + + lua_push_bool_table_entry(vm, "is_dump_flows_to_mysql_enabled", dump_flows_on_mysql || read_flows_from_mysql); + if(mysql_dbname) lua_push_str_table_entry(vm, "mysql_dbname", mysql_dbname); + lua_push_bool_table_entry(vm, "is_dump_flows_to_es_enabled", dump_flows_on_es); + lua_push_bool_table_entry(vm, "is_dump_flows_to_ls_enabled", dump_flows_on_ls); #if defined(HAVE_NINDEX) && defined(NTOPNG_PRO) lua_push_bool_table_entry(vm, "is_nindex_enabled", do_dump_flows_on_nindex()); #endif - - if(mysql_dbname) lua_push_str_table_entry(vm, "mysql_dbname", mysql_dbname); - lua_push_bool_table_entry(vm, "is_dump_flows_to_es_enabled", dump_flows_on_es); - lua_push_bool_table_entry(vm, "is_dump_flows_to_ls_enabled", dump_flows_on_ls); lua_push_uint64_table_entry(vm, "http.port", get_http_port()); @@ -1794,10 +1798,6 @@ void Prefs::lua(lua_State* vm) { lua_push_str_table_entry(vm, "user", change_user ? user : (char*)""); lua_push_str_table_entry(vm, "capture_direction", Utils::captureDirection2Str(captureDirection)); - -#ifdef NTOPNG_PRO - lua_push_bool_table_entry(vm, "is_direct_flow_dump_enabled", do_dump_flows_direct()); -#endif } /* *************************************** */