diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 7b51d2e282a..d58f19ba7df 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -195,11 +195,12 @@ class IisFormat(RegexFormat): 'cs-uri-stem': '(?P/\S*)', 'cs-uri-query': '(?P\S*)', 'c-ip': '"?(?P[\d*.]*)"?', - 'cs(User-Agent)': '(?P".*?"|\S+)', # TODO: also benchmark regex. + 'cs(User-Agent)': '(?P".*?"|\S+)', 'cs(Referer)': '(?P\S+)', 'sc-status': '(?P\d+)', 'sc-bytes': '(?P\S+)', 'cs-host': '(?P\S+)', + 'cs-username': '(?P\S+)' } def __init__(self): @@ -1285,8 +1286,9 @@ def _get_hit_args(self, hit): 'cdt': self.date_to_piwik(hit.date), 'idsite': site_id, 'dp': '0' if config.options.reverse_dns else '1', - 'ua': hit.user_agent.encode('utf8'), + 'ua': hit.user_agent.encode('utf8') } + if config.options.replay_tracking: # prevent request to be force recorded when option replay-tracking args['rec'] = '0' @@ -1695,6 +1697,16 @@ def invalid_line(line, reason): # Some formats have no host. pass + # Add userid + try: + hit.userid = None + + userid = format.get('userid') + if userid != '-': + hit.args['uid'] = userid + except: + pass + # Check if the hit must be excluded. if not all((method(hit) for method in self.check_methods)): continue diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index 7659afdaffd..bf548f4416e 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -232,7 +232,8 @@ def check_iis_groups(groups): assert groups['host'] == 'example.com' expected_hit_properties = ['date', 'path', 'query_string', 'ip', 'referrer', 'user_agent', - 'status', 'length', 'host'] + 'status', 'length', 'host', 'userid'] + for property_name in groups.keys(): assert property_name in expected_hit_properties diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml index 020761177c1..176602a54c7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -5,13 +5,13 @@ 2 2 180 - 2 - 3 + 1 + 2 182 - 1 + 0 1 90 - 50% + 0% 50% @@ -29,23 +29,6 @@ 0% 0% - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml index 760d1e36f0b..d2e1425cd76 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -29,13 +29,13 @@ 0 0 - 2 - 3 + 1 + 2 182 - 1 + 0 1 90 - 50% + 0% 50% 0 @@ -54,23 +54,6 @@ 0% 0% - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 422bfa8942a..fa1ff1f0058 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -468,6 +468,122 @@ + + + 2 + 2 + 0 + 2 + 2 + 1 + 2 + 2 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/from/another/world/6,681965 + + + + + + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/world/6,681965 + + + + + 1 @@ -588,56 +704,6 @@ - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/hello/world/6,681965 - - - - - 1 @@ -746,13 +812,12 @@ 1 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 0 - 100% - 100% + 0% + 0% @@ -760,16 +825,14 @@ 1 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 1 1 - 1 0 - 100% - 100% + 0% + 0% http://piwik.net/Products/theProduct @@ -936,40 +999,6 @@ - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/Topic/hw43061 - - - 1 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index 0f3aa66b95d..3e13cb2ee30 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -784,6 +784,126 @@ + + + 2 + 2 + 0 + 0 + + 0 + 2 + 2 + 1 + 2 + 2 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/from/another/world/6,681965 + + + + + + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/world/6,681965 + + + + + 2 @@ -969,60 +1089,6 @@ - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/hello/world/6,681965 - - - - - 1 @@ -1146,13 +1212,12 @@ 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 0 - 100% - 100% + 0% + 0% 0 @@ -1161,16 +1226,14 @@ 1 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 1 1 - 1 0 - 100% - 100% + 0% + 0% http://piwik.net/Products/theProduct @@ -1341,44 +1404,6 @@ - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/Topic/hw43061 - - - 1 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml index a58e9b42ed8..5d27ad05181 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -5,13 +5,13 @@ 2 2 180 - 2 - 3 + 1 + 2 182 - 1 + 0 1 90 - 50% + 0% 50% @@ -19,16 +19,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml index 682edbd2ba1..dac53bf5b0f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -29,13 +29,13 @@ 0 0 - 2 - 3 + 1 + 2 182 - 1 + 0 1 90 - 50% + 0% 50% 0 @@ -44,16 +44,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 47a40e19e27..5e98c561158 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -465,6 +465,122 @@ + + + 2 + 2 + 0 + 2 + 2 + 1 + 2 + 2 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/from/another/world/6,681965 + + + + + + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/world/6,681965 + + + + + 1 @@ -582,56 +698,6 @@ - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/hello/world/6,681965 - - - - - 1 @@ -734,40 +800,6 @@ - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/Products/theProduct - - - 1 @@ -935,13 +967,9 @@ 1 1 0 - 1 - 1 - 0 - 1 1 0 - 100% + 0% 100% @@ -949,16 +977,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% http://piwik.net/Topic/hw43061 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index ce178ffc4b3..0922ac138fd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -781,6 +781,126 @@ + + + 2 + 2 + 0 + 0 + + 0 + 2 + 2 + 1 + 2 + 2 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/from/another/world/6,681965 + + + + + + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/world/6,681965 + + + + + 2 @@ -957,60 +1077,6 @@ - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/hello/world/6,681965 - - - - - 1 @@ -1125,44 +1191,6 @@ - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/Products/theProduct - - - 1 @@ -1337,13 +1365,9 @@ 0 0 - 1 - 1 - 0 - 1 1 0 - 100% + 0% 100% 0 @@ -1352,16 +1376,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% http://piwik.net/Topic/hw43061 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 590338f7e98..201498137fa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,10 +2,10 @@ - 22 - 22 + 23 + 23 0 - 22 + 23 0 0% 0% @@ -15,13 +15,13 @@ 2 2 180 - 2 - 3 + 1 + 2 182 - 1 + 0 1 90 - 50% + 0% 50% @@ -44,16 +44,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml index 57201f61356..72c06ff0d91 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -2,13 +2,13 @@ - 23 - 32 + 24 + 33 0 10 0.023 1.324 - 23 + 24 0 0% 0% @@ -43,13 +43,13 @@ 0 0 - 2 - 3 + 1 + 2 182 - 1 + 0 1 90 - 50% + 0% 50% 0 @@ -73,16 +73,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index f06bc16d8e5..fd9e8bda037 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -481,6 +481,122 @@ + + + 2 + 2 + 0 + 2 + 2 + 1 + 2 + 2 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/from/another/world/6,681965 + + + + + + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/world/6,681965 + + + + + 1 @@ -614,56 +730,6 @@ - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/hello/world/6,681965 - - - - - 1 @@ -772,13 +838,12 @@ 1 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 0 - 100% - 100% + 0% + 0% @@ -786,16 +851,14 @@ 1 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 1 1 - 1 0 - 100% - 100% + 0% + 0% http://piwik.net/Products/theProduct @@ -967,13 +1030,9 @@ 1 1 0 - 1 - 1 - 0 - 1 1 0 - 100% + 0% 100% @@ -981,16 +1040,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% http://piwik.net/Topic/hw43061 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index 7f92f111a82..cd8e4c402b1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -816,6 +816,126 @@ + + + 2 + 2 + 0 + 0 + + 0 + 2 + 2 + 1 + 2 + 2 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/from/another/world/6,681965 + + + + + + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/hello/world/6,681965 + + + + + 2 @@ -1047,60 +1167,6 @@ - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - http://piwik.net/hello/world/6,681965 - - - - - 1 @@ -1224,13 +1290,12 @@ 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 0 - 100% - 100% + 0% + 0% 0 @@ -1239,16 +1304,14 @@ 1 0 1 - 1 - 0 - 1 - 1 + 2 + 2 + 0 1 1 - 1 0 - 100% - 100% + 0% + 0% http://piwik.net/Products/theProduct @@ -1427,13 +1490,9 @@ 0 0 - 1 - 1 - 0 - 1 1 0 - 100% + 0% 100% 0 @@ -1442,16 +1501,11 @@ 1 1 0 - 1 - 1 - 0 - 1 1 1 - 1 1 0 - 100% + 0% 100% http://piwik.net/Topic/hw43061 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml index b3451748fd2..5324c5b44b0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,7 +1,7 @@ - 31 - 31 + 32 + 32 4 4 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml index b1758df9dde..d57d00aeaa3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,7 +1,7 @@ - 55 - 49 + 56 + 50 5 5 1 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 22d47b36a9e..491523012e9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,13 +2,13 @@ - 34 + 35 - 25 - 27 - 25 + 26 + 28 + 26 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 5c617d6f7b9..34fadbbd572 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -5,11 +5,11 @@ 28 32 3 - 547 + 548 25 26 - 28 - 0 + 27 + 1 plugins/DevicesDetection/images/brand/Unknown.ico @@ -27,13 +27,13 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/DevicesDetection/images/brand/Samsung.ico \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index e633e41334e..147f52ac7c9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -25,13 +25,13 @@ 3 - 3 - 1 - 0 - 3 + 4 + 2 + 3 + 2 3 - 3 - 0 + 2 + 2 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index bb10be5333c..aa77898c8ac 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -5,11 +5,11 @@ 7 7 1 - 0 + 1 7 7 - 7 - 0 + 6 + 1 plugins/UserSettings/images/browsers/CH.gif @@ -87,13 +87,13 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/UserSettings/images/browsers/CM.gif \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 9e0f3a5f5d2..ae018d6af02 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -72,6 +72,18 @@ 0 plugins/UserSettings/images/browsers/CH.gif + + + 2 + 2 + 1 + 1 + 2 + 2 + 1 + 1 + plugins/UserSettings/images/browsers/CH.gif + 2 @@ -108,40 +120,16 @@ 0 plugins/UserSettings/images/browsers/CH.gif - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/browsers/CH.gif - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/browsers/CH.gif - 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/UserSettings/images/browsers/CM.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index bb10be5333c..aa77898c8ac 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -5,11 +5,11 @@ 7 7 1 - 0 + 1 7 7 - 7 - 0 + 6 + 1 plugins/UserSettings/images/browsers/CH.gif @@ -87,13 +87,13 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/UserSettings/images/browsers/CM.gif \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 0f2787c966e..d0be913ad26 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -5,11 +5,11 @@ 28 32 3 - 547 + 548 25 26 - 28 - 0 + 27 + 1 @@ -25,12 +25,12 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index ce61cb81328..2425b6fcd86 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -17,11 +17,11 @@ 8 11 3 - 305 + 306 6 7 - 8 - 0 + 7 + 1 plugins/UserSettings/images/os/MAC.gif @@ -39,13 +39,13 @@ 3 - 3 - 1 - 0 - 3 + 4 + 2 + 2 + 2 3 3 - 0 + 1 plugins/UserSettings/images/os/AND.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 4b74318cfad..4a7630b4576 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -53,11 +53,11 @@ 2 2 1 - 0 + 1 2 2 - 2 - 0 + 1 + 1 plugins/UserSettings/images/os/MAC.gif @@ -75,13 +75,13 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/UserSettings/images/os/AND.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 3dea4325612..e838256d3f2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -5,23 +5,23 @@ 26 30 3 - 547 + 548 23 25 - 26 - 0 + 25 + 1 plugins/DevicesDetection/images/screens/normal.gif 3 - 3 - 1 - 0 - 3 + 4 + 2 + 2 + 2 3 3 - 0 + 1 plugins/DevicesDetection/images/screens/smartphone.png diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 597edb27dad..dbe8ad476dc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -1797,9 +1797,9 @@ action http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp 302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp - 61 + 62 - 61 + 62 HTTP-code @@ -1815,7 +1815,7 @@ all 1 5 - 61 + 62 http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp plugins/Morpheus/images/goal.png @@ -1824,9 +1824,9 @@ action http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp - 62 + 63 - 62 + 63 HTTP-code @@ -1908,8 +1908,8 @@ 1 - 42 - 70.95.0.0 + 44 + 173.5.0.0 @@ -1917,18 +1917,18 @@ all 1 5 - 58 + 61 - http://piwik.net/Products/theProduct + http://piwik.net/hello/from/another/world/6,681965 plugins/Morpheus/images/goal.png action - http://piwik.net/Products/theProduct + http://piwik.net/hello/from/another/world/6,681965 - 55 + 60 - 58 + 61 HTTP-code @@ -1947,9 +1947,9 @@ 0 1 - - new - + user2 + returning + plugins/Live/images/returningVisitor.gif 1 plugins/Morpheus/images/goal.png 1 @@ -1958,21 +1958,21 @@ 0 0 - 0 - 0s + 1 + 1s - Smartphone - Android - AND - plugins/UserSettings/images/os/AND.gif + Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif Blink Blink (Chrome, Opera) - Chrome Mobile 39.0 - Chrome Mobile - plugins/UserSettings/images/browsers/CM.gif - CM - 39.0 + Chrome 37.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 37.0 0 Unknown Unknown @@ -1999,7 +1999,7 @@ unknown - 17:00:00 + 17:30:00 17 0 @@ -2010,8 +2010,8 @@ 1 - 43 - 70.95.32.0 + 42 + 70.95.0.0 @@ -2019,9 +2019,9 @@ all 1 5 - 59 + 58 - http://piwik.net/Topic/hw43061 + http://piwik.net/Products/theProduct plugins/Morpheus/images/goal.png @@ -2039,6 +2039,23 @@ + + action + http://piwik.net/Products/theProduct + + 55 + + 58 + + + HTTP-code + 200 + + + 0 + 0s + + 1 USD @@ -2048,8 +2065,8 @@ 0 - 1 - + 2 + user1 new 1 @@ -2060,21 +2077,21 @@ 0 0 - 0 - 0s + 2 + 2s - Desktop - Mac - MAC - plugins/UserSettings/images/os/MAC.gif + Smartphone + Android + AND + plugins/UserSettings/images/os/AND.gif Blink Blink (Chrome, Opera) - Chrome 41.0 - Chrome - plugins/UserSettings/images/browsers/CH.gif - CH - 41.0 + Chrome Mobile 39.0 + Chrome Mobile + plugins/UserSettings/images/browsers/CM.gif + CM + 39.0 0 Unknown Unknown @@ -2112,7 +2129,7 @@ 1 - 44 + 43 173.5.0.0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml index e8065d52ef1..d2edd33b602 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -3,8 +3,8 @@ 31 - 35 - 31 + 36 + 32 145 100% 100% diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml index ee1db378e4f..79b56ff9799 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,11 +1,11 @@ 31 - 35 + 36 100% 100% 100% 100% - 31 + 32 145 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml index a640dc2c7dd..f83cd0a71c0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -3,13 +3,13 @@ 31 - 35 + 36 3 - 547 - 28 + 550 + 27 29 - 31 - 0 + 30 + 2 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index 833b95476d7..9b5ba79691a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -3,10 +3,10 @@ 29 - 33 + 34 3 - 547 - 26 + 550 + 25 27 @@ -16,8 +16,8 @@ 27 135 - 29 - 0 + 28 + 2 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml index 8ecf743d812..dc702824f12 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -3,10 +3,10 @@ 26 - 30 + 31 3 - 547 - 23 + 550 + 22 24 @@ -16,8 +16,8 @@ 24 120 - 26 - 0 + 25 + 2 Unknown xx xx diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 74286f55c28..212e81c7859 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -23,10 +23,10 @@ 8 - 8 - 1 - 0 - 8 + 9 + 2 + 3 + 7 8 @@ -36,8 +36,8 @@ 8 40 - 8 - 0 + 7 + 2 North America diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 16b270d486f..1c82333bf07 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -26,10 +26,10 @@ 8 - 8 - 1 - 0 - 8 + 9 + 2 + 3 + 7 8 @@ -39,8 +39,8 @@ 8 40 - 8 - 0 + 7 + 2 us plugins/UserCountry/images/flags/us.png 16 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 46e7ebb0cf2..1149b705a7c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -3,10 +3,10 @@ 26 - 30 + 31 3 - 547 - 23 + 550 + 22 24 @@ -16,8 +16,8 @@ 24 120 - 26 - 0 + 25 + 2 xx xx Unknown diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index e633e41334e..147f52ac7c9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -25,13 +25,13 @@ 3 - 3 - 1 - 0 - 3 + 4 + 2 + 3 + 2 3 - 3 - 0 + 2 + 2 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 9e0f3a5f5d2..ae018d6af02 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -72,6 +72,18 @@ 0 plugins/UserSettings/images/browsers/CH.gif + + + 2 + 2 + 1 + 1 + 2 + 2 + 1 + 1 + plugins/UserSettings/images/browsers/CH.gif + 2 @@ -108,40 +120,16 @@ 0 plugins/UserSettings/images/browsers/CH.gif - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/browsers/CH.gif - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/browsers/CH.gif - 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/UserSettings/images/browsers/CM.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index bb10be5333c..aa77898c8ac 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -5,11 +5,11 @@ 7 7 1 - 0 + 1 7 7 - 7 - 0 + 6 + 1 plugins/UserSettings/images/browsers/CH.gif @@ -87,13 +87,13 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/UserSettings/images/browsers/CM.gif \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index dc61e1f5f97..75d278b51bb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -38,11 +38,11 @@ 3 3 1 - 0 + 1 3 3 - 3 - 0 + 2 + 1 @@ -80,13 +80,13 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml index ece488d72fd..8d4b8d074e8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml @@ -3,12 +3,12 @@ 31 - 35 + 36 3 - 547 - 28 + 550 + 27 29 - 31 - 0 + 30 + 2 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml index 084ab04d629..3ed6ff73098 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -3,12 +3,12 @@ 31 - 35 + 36 3 - 547 - 28 + 550 + 27 29 - 31 - 0 + 30 + 2 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 3dea4325612..e838256d3f2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -5,23 +5,23 @@ 26 30 3 - 547 + 548 23 25 - 26 - 0 + 25 + 1 plugins/DevicesDetection/images/screens/normal.gif 3 - 3 - 1 - 0 - 3 + 4 + 2 + 2 + 2 3 3 - 0 + 1 plugins/DevicesDetection/images/screens/smartphone.png diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index ce61cb81328..2425b6fcd86 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -17,11 +17,11 @@ 8 11 3 - 305 + 306 6 7 - 8 - 0 + 7 + 1 plugins/UserSettings/images/os/MAC.gif @@ -39,13 +39,13 @@ 3 - 3 - 1 - 0 - 3 + 4 + 2 + 2 + 2 3 3 - 0 + 1 plugins/UserSettings/images/os/AND.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml index 4b74318cfad..4a7630b4576 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -53,11 +53,11 @@ 2 2 1 - 0 + 1 2 2 - 2 - 0 + 1 + 1 plugins/UserSettings/images/os/MAC.gif @@ -75,13 +75,13 @@ 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 plugins/UserSettings/images/os/AND.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml index b6ac74ebfb1..378996fabca 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -3,13 +3,13 @@ 29 - 33 + 34 3 - 547 - 26 + 550 + 25 27 - 29 - 0 + 28 + 2 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml index 3633fe59145..02a0dc72729 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml @@ -1,14 +1,14 @@ - 1 - 0 - 1 - 1 - 1 - 1 - 0 + 2 + 1 + 2 + 2 + 2 + 2 + 1 1 100% 1 - 0 + 1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml index f301254690d..c42125d0729 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml @@ -1,12 +1,12 @@ - 10 - 12 - 9 - 8 - 115 + 11 + 13 + 10 + 9 + 116 2 - 80% + 82% 1.2 - 12 + 11 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index a9ba6ca6cc3..4de7a18047e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -13,11 +13,11 @@ 5 - 5 - 5 - 0 - 0 - 5 + 4 + 6 + 2 + 3 + 4 5 3 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index c87485d5b2a..dc841363a5d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -190,13 +190,13 @@ 6 - 6 - 1 - 0 - 6 + 7 + 2 + 3 + 5 5 - 6 - 0 + 5 + 2 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index edf1ec12d55..144d6c42217 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -253,13 +253,13 @@ 6 - 6 - 1 - 0 - 6 + 7 + 2 + 3 + 5 0 - 6 - 0 + 5 + 2 5 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index 6fbe7c310c1..005a1842ab8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,11 +2,11 @@ - 30 + 29 - 0 + 1 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index c859e7d5d33..a66c195749e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,11 +2,11 @@ - 34 + 33 - 3 + 4 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index 795ab1f55ee..c00b8e2c507 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,11 +2,11 @@ - 28 + 27 - 2 + 3 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml index 6169ecedc1b..95adfb7f9a3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -2,11 +2,11 @@ - 37 + 36 - 4 + 5 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml index 8e4b837a626..8af80c337fc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml @@ -1,2 +1,2 @@ -35 \ No newline at end of file +36 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml index ed30e7d83c0..40bd2e592a5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml @@ -1,2 +1,2 @@ -28 \ No newline at end of file +27 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml index 1df778a05d1..e686bbc101b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml @@ -1,2 +1,2 @@ -9 min 7s \ No newline at end of file +9 min 10s \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml index 38da89c9f07..9674a59b3a4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml @@ -1,2 +1,2 @@ -547 \ No newline at end of file +550 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 51c650b8b2b..3fb94696674 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml @@ -1,2 +1,2 @@ -31 \ No newline at end of file +30 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml index f5722c2b947..13002b20179 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml @@ -1,2 +1,2 @@ -0 \ No newline at end of file +2 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml index 113678e0903..1772684d5e1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,14 +1,14 @@ - 31 - 0 + 30 + 2 31 - 35 + 36 29 - 28 - 547 + 27 + 550 3 - 90% - 1.1 + 87% + 1.2 18 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index 3f360d1263b..bce2027e1c7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -4,8 +4,8 @@ 31 - 35 - 31 + 36 + 32 145 29 100% @@ -43,8 +43,8 @@ 5 1 -96.8% - -71.4% - -67.7% + -72.2% + -68.8% -96.6% -96.6% diff --git a/tests/resources/access-logs/fake_logs_custom_iis.log b/tests/resources/access-logs/fake_logs_custom_iis.log index 73797b64ddc..d7ff476a6c5 100644 --- a/tests/resources/access-logs/fake_logs_custom_iis.log +++ b/tests/resources/access-logs/fake_logs_custom_iis.log @@ -2,6 +2,7 @@ #Version: 1.0 #Start-Date: 2014-11-18 00:00:00.128 #Fields: date-local time-local s-ip cs-method cs-uri-stem cs-uri-query s-port cs-username c-ip cs(User-Agent) cs(Referer) cs(Host) sc-status sc-substatus sc-win32-status TimeTakenMS -2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 - "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109 -2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 - "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0 +2012-08-15 17:00:00.363 10.10.28.140 GET /Products/theProduct - 80 user1 "70.95.0.0" "Mozilla/5.0 (Linux; Android 4.4.4; SM-G900V Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" "http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en" "xzy.example.com" 200 0 0 109 +2012-08-15 17:00:00.660 10.10.28.140 GET /Topic/hw43061 - 80 user1 "70.95.32.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36" - "example.hello.com" 301 0 0 0 2012-08-15 17:00:00.675 10.10.28.140 GET /hello/world/6,681965 - 80 - "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 404 0 0 359 +2012-08-15 17:30:00.675 10.10.28.140 GET /hello/from/another/world/6,681965 - 80 user2 "173.5.0.0" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 Safari/537.36" - "hello.example.com" 200 0 0 359