Fix interface RRD overlap between mining category and application

Interface categories are now placed under the ndpi_categories rrd subfolder. Existing data is migrated.

scripts/lua/modules/timeseries/tests/influxdb2series.lua

@@ -522,6 +522,11 @@ end
 -- ##############################################
 
 function run(tester)
+  if influxdb.db == nil then
+    print("Skipping influx2Series tests. Enable InfluxDB export in order to test.<br/>")
+    return(true)
+  end
+
   local rv = tester.run_test("influx2Series:test_sampling1", test_sampling1)
   rv = tester.run_test("influx2Series:test_datafill1", test_datafill1) and rv
   rv = tester.run_test("influx2Series:test_datafill2", test_datafill2) and rv

scripts/lua/modules/timeseries/tests/influxdb_queries.lua

@@ -90,6 +90,11 @@ end
 -- ##############################################
 
 function run(tester)
+  if influxdb.db == nil then
+    print("Skipping influx_query tests. Enable InfluxDB export in order to test.<br/>")
+    return(true)
+  end
+
   local rv = tester.run_test("influx_query:test_simple_derivative", test_simple_derivative)
 
   return rv

scripts/lua/modules/timeseries/tests/rrd_paths_test.lua

@@ -18,8 +18,7 @@ local prefixes_to_skip = {
 }
 
 local suffixes_to_skip = {
-  ndpi_categories = true,     -- Collides with nDPI protocol, but we assume that they hold different values
-  l4protos = true,            -- Collides with nDPI protocol, but we assume that they hold different values
+  l4protos = true,            -- Currently no overlap happens. "icmp" is the l4 protocol, "ICMP" is the l7 application
 }
 
 -- ##############################################