From 04f64ac0a4939b0af0dbb049ebb35ec8f8d0f32b Mon Sep 17 00:00:00 2001 From: diosmosis Date: Fri, 12 Dec 2014 21:51:37 -0800 Subject: [PATCH] Adding support for parsing amazon cloudfront log files in log importer & making W3cExtendedFormat treat time-taken field as seconds by default (since that is what the W3C format specifies). Also add support for event tracking and cloudfront RTMP logs (which provide event logs). Also allow multiple spaces in between W3C extended log files. Allow derived classes of W3cExtendedFormat to define new custom field regexes. --- misc/log-analytics/import_logs.py | 20 +- misc/log-analytics/tests/tests.py | 2 +- .../Fixtures/ManySitesImportedLogs.php | 30 ++ tests/PHPUnit/Framework/Fixture.php | 2 - tests/PHPUnit/System/ImportLogsTest.php | 5 +- ...rtLogs__Actions.getEntryPageUrls_month.xml | 62 ++++ ...rtLogs__Actions.getEntryPageUrls_range.xml | 62 ++++ ...ortLogs__Actions.getExitPageUrls_month.xml | 62 ++++ ...ortLogs__Actions.getExitPageUrls_range.xml | 62 ++++ ...mportLogs__Actions.getPageTitles_month.xml | 12 +- ...mportLogs__Actions.getPageTitles_range.xml | 12 +- ..._ImportLogs__Actions.getPageUrls_month.xml | 62 ++++ ..._ImportLogs__Actions.getPageUrls_range.xml | 62 ++++ .../test_ImportLogs__Actions.get_month.xml | 6 +- .../test_ImportLogs__Actions.get_range.xml | 6 +- ...stomVariables.getCustomVariables_month.xml | 8 +- ...tLogs__DevicesDetection.getBrand_month.xml | 10 +- ...vicesDetection.getBrowserEngines_month.xml | 22 +- ...icesDetection.getBrowserFamilies_month.xml | 22 +- ...icesDetection.getBrowserVersions_month.xml | 24 +- ...gs__DevicesDetection.getBrowsers_month.xml | 22 +- ...tLogs__DevicesDetection.getModel_month.xml | 10 +- ...__DevicesDetection.getOsFamilies_month.xml | 40 +-- ...__DevicesDetection.getOsVersions_month.xml | 20 +- ...rtLogs__DevicesDetection.getType_month.xml | 34 +- ...est_ImportLogs__Events.getAction_month.xml | 38 ++- ...t_ImportLogs__Events.getCategory_month.xml | 38 ++- .../test_ImportLogs__Events.getName_month.xml | 51 ++- ...tLogs__Goals.getDaysToConversion_month.xml | 2 +- ...__Goals.getVisitsUntilConversion_month.xml | 2 +- .../test_ImportLogs__Goals.get_month.xml | 8 +- ...tLogs__Live.getLastVisitsDetails_range.xml | 290 ++++++++++++++++++ ...st_ImportLogs__MultiSites.getAll_month.xml | 8 +- ...st_ImportLogs__MultiSites.getOne_month.xml | 8 +- ...ImportLogs__Provider.getProvider_month.xml | 10 +- ...tLogs__Referrers.getReferrerType_month.xml | 19 +- ..._ImportLogs__UserCountry.getCity_month.xml | 19 +- ...rtLogs__UserCountry.getContinent_month.xml | 37 +-- ...portLogs__UserCountry.getCountry_month.xml | 41 +-- ...mportLogs__UserCountry.getRegion_month.xml | 19 +- ...ogs__UserSettings.getBrowserType_month.xml | 22 +- ...__UserSettings.getBrowserVersion_month.xml | 24 +- ...ortLogs__UserSettings.getBrowser_month.xml | 22 +- ...s__UserSettings.getConfiguration_month.xml | 15 +- ...gs__UserSettings.getLanguageCode_month.xml | 10 +- ...rtLogs__UserSettings.getLanguage_month.xml | 10 +- ..._UserSettings.getMobileVsDesktop_month.xml | 34 +- ...rtLogs__UserSettings.getOSFamily_month.xml | 40 +-- ...t_ImportLogs__UserSettings.getOS_month.xml | 20 +- ...portLogs__UserSettings.getPlugin_month.xml | 6 +- ...Logs__UserSettings.getResolution_month.xml | 10 +- ...rtLogs__VisitTime.getByDayOfWeek_month.xml | 18 +- ....getVisitInformationPerLocalTime_month.xml | 22 +- ...getVisitInformationPerServerTime_month.xml | 29 +- ...getNumberOfVisitsByDaysSinceLast_month.xml | 2 +- ...getNumberOfVisitsByDaysSinceLast_range.xml | 2 +- ...st.getNumberOfVisitsByVisitCount_month.xml | 2 +- ...st.getNumberOfVisitsByVisitCount_range.xml | 8 +- ...nterest.getNumberOfVisitsPerPage_month.xml | 2 +- ...nterest.getNumberOfVisitsPerPage_range.xml | 2 +- ...etNumberOfVisitsPerVisitDuration_month.xml | 2 +- ...etNumberOfVisitsPerVisitDuration_range.xml | 2 +- ...rtLogs__VisitsSummary.getActions_month.xml | 2 +- ...gs__VisitsSummary.getBounceCount_month.xml | 2 +- ..._VisitsSummary.getUniqueVisitors_month.xml | 2 +- ...VisitsSummary.getVisitsConverted_month.xml | 2 +- ...ortLogs__VisitsSummary.getVisits_month.xml | 2 +- ...st_ImportLogs__VisitsSummary.get_month.xml | 16 +- ...ancedAndLast7__MultiSites.getAll_month.xml | 20 +- .../access-logs/fake_logs_cloudfront.log | 3 + .../access-logs/fake_logs_cloudfront_rtmp.log | 4 + 71 files changed, 1256 insertions(+), 370 deletions(-) create mode 100644 tests/resources/access-logs/fake_logs_cloudfront.log create mode 100644 tests/resources/access-logs/fake_logs_cloudfront_rtmp.log diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index dfd8236d4ae..889353377b4 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -254,8 +254,6 @@ def check_format(self, file): regex = '\S+' full_regex.append(regex) full_regex = '\s+'.join(full_regex) - logging.debug(full_regex) - logging.debug(first_line) self.regex = re.compile(full_regex) file.seek(0) @@ -1392,8 +1390,15 @@ def _get_hit_args(self, hit): ) if hit.generation_time_milli > 0: - args['gt_ms'] = hit.generation_time_milli - logging.debug(args) + args['gt_ms'] = int(hit.generation_time_milli) + + if hit.event_category and hit.event_action: + args['e_c'] = hit.event_category + args['e_a'] = hit.event_action + + if hit.event_name: + args['e_n'] = hit.event_name + return args def _record_hits(self, hits): @@ -1583,7 +1588,7 @@ def check_format(lineOrFile): else: match = candidate_format.check_format(lineOrFile) except Exception, e: - logging.debug(str(e)) + logging.debug('Error in format checking: %s', str(e)) pass if match: @@ -1790,9 +1795,14 @@ def invalid_line(line, reason): # add event info try: + hit.event_category = hit.event_action = hit.event_name = None + hit.event_category = format.get('event_category') hit.event_action = format.get('event_action') + hit.event_name = format.get('event_name') + if hit.event_name == '-': + hit.event_name = None except: pass diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index 6e0051c5edb..39e4bc7dbb1 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -342,7 +342,7 @@ def test_iis_custom_format(): import_logs.config.options.enable_http_redirects = True import_logs.config.options.enable_http_errors = True import_logs.config.options.replay_tracking = False - # import_logs.config.options.w3c_time_taken_in_millisecs = True test that even w/o this, we get the right format + # import_logs.config.options.w3c_time_taken_in_millisecs = True test that even w/o this, we get the right values import_logs.parser.parse(file_) hits = [hit.__dict__ for hit in Recorder.recorders] diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 7642befc165..0603ae4d4b9 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -29,6 +29,8 @@ class ManySitesImportedLogs extends Fixture public $addSegments = false; public $includeIisWithCustom = false; public $includeNetscaler = false; + public $includeCloudfront = false; + public $includeCloudfrontRtmp = false; public static function createAccessInstance() { @@ -121,6 +123,14 @@ private function trackVisits() if ($this->includeNetscaler) { $this->logNetscaler(); } + + if ($this->includeCloudfront) { + $this->logCloudfront(); + } + + if ($this->includeCloudfrontRtmp) { + $this->logCloudfrontRtmp(); + } } private function setupSegments() @@ -264,4 +274,24 @@ private function logNetscaler() return self::executeLogImporter($logFile, $opts); } + + private function logCloudfront() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth()); + + return self::executeLogImporter($logFile, $opts); + } + + private function logCloudfrontRtmp() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth()); + + return self::executeLogImporter($logFile, $opts); + } } \ No newline at end of file diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 8a1673538d8..a2d6a6327a8 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -776,8 +776,6 @@ protected static function executeLogImporter($logFile, $options) // run the command exec($cmd, $output, $result); - echo "$cmd - \n"; - echo implode("\n", $output)."\n"; if ($result !== 0) { throw new Exception("log importer failed: " . implode("\n", $output) . "\n\ncommand used: $cmd"); } diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index b13317b68fc..5de667fb5cb 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -20,6 +20,7 @@ */ class ImportLogsTest extends SystemTestCase { + /** @var ManySitesImportedLogs */ public static $fixture = null; // initialized below class definition /** @@ -104,4 +105,6 @@ public static function getOutputPrefix() ImportLogsTest::$fixture = new ManySitesImportedLogs(); ImportLogsTest::$fixture->includeIisWithCustom = true; -ImportLogsTest::$fixture->includeNetscaler = true; \ No newline at end of file +ImportLogsTest::$fixture->includeNetscaler = true; +ImportLogsTest::$fixture->includeCloudfront = true; +ImportLogsTest::$fixture->includeCloudfrontRtmp = true; \ No newline at end of file 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 6ae99318f04..1e6f6a255d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -1129,4 +1129,66 @@ + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.001 + http://piwik.net/view/my/file.html + + + + + \ No newline at end of file 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 cce26eeec72..0b50d71afa2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -1470,4 +1470,66 @@ + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.001 + http://piwik.net/view/my/file.html + + + + + \ No newline at end of file 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 f3ebc92964d..456545a4049 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -1113,4 +1113,66 @@ + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.001 + http://piwik.net/view/my/file.html + + + + + \ No newline at end of file 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 63c3d594e06..0333b89144a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -1448,6 +1448,68 @@ + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.001 + http://piwik.net/view/my/file.html + + + + + 1 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 7ecefada555..0fe5e0f680a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,17 +2,17 @@ - 23 - 23 + 24 + 24 0 - 2 - 0.109 + 3 + 0.001 0.359 - 23 + 24 0 0% 0% - 0.234 + 0.156 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 690c2e28a00..1a9344607de 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -2,17 +2,17 @@ - 24 - 33 + 25 + 34 0 - 12 - 0.023 + 13 + 0.001 1.324 - 24 + 25 0 0% 0% - 0.361 + 0.333 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 c7ae80a4540..cbdc5cc10c3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -1188,4 +1188,66 @@ + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.001 + http://piwik.net/view/my/file.html + + + + + \ No newline at end of file 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 3434158d1fd..086a61b4f5b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -1577,6 +1577,68 @@ + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.001 + + + + 1 + 1 + 0 + 1 + 0.001 + 0.001 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.001 + http://piwik.net/view/my/file.html + + + + + 1 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 18b7f289f64..2bfcebff1f4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -1,12 +1,12 @@ - 32 - 32 + 33 + 33 4 4 0 0 0 0 - 0.277 + 0.208 \ No newline at end of file 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 0fc359540dc..a555907e639 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -1,12 +1,12 @@ - 56 - 50 + 57 + 51 5 5 1 1 0 0 - 0.298 + 0.285 \ No newline at end of file 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 491523012e9..4214925c47c 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 @@ - 35 + 38 - 26 - 28 - 26 + 29 + 31 + 29 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 34fadbbd572..6fd6bdf02bf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -2,13 +2,13 @@ - 28 - 32 + 31 + 35 3 548 - 25 - 26 - 27 + 28 + 27 + 30 1 plugins/DevicesDetection/images/brand/Unknown.ico 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 147f52ac7c9..f57f78606cd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -22,6 +22,17 @@ 7 0 + + + 5 + 5 + 1 + 0 + 5 + 2 + 5 + 0 + 3 @@ -33,17 +44,6 @@ 2 2 - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - 0 - 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 82fd2a7603c..d0c894d25c2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -49,19 +49,19 @@ plugins/DevicesDetection/images/browsers/CH.gif - - 2 - 2 + + 5 + 5 1 0 - 2 + 5 2 - 2 + 5 0 - plugins/DevicesDetection/images/browsers/AN.gif + plugins/DevicesDetection/images/browsers/UNK.gif - + 2 2 1 @@ -70,19 +70,19 @@ 2 2 0 - plugins/DevicesDetection/images/browsers/FF.gif + plugins/DevicesDetection/images/browsers/AN.gif - + 2 2 1 0 2 - 1 + 2 2 0 - plugins/DevicesDetection/images/browsers/UNK.gif + plugins/DevicesDetection/images/browsers/FF.gif 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 90f330a5e57..bcc37fcec6a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -36,6 +36,18 @@ 0 plugins/DevicesDetection/images/browsers/CH.gif + + + 5 + 5 + 1 + 0 + 5 + 2 + 5 + 0 + plugins/DevicesDetection/images/browsers/UNK.gif + 2 @@ -96,18 +108,6 @@ 0 plugins/DevicesDetection/images/browsers/FF.gif - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - 0 - plugins/DevicesDetection/images/browsers/UNK.gif - 1 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 82fd2a7603c..d0c894d25c2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -49,19 +49,19 @@ plugins/DevicesDetection/images/browsers/CH.gif - - 2 - 2 + + 5 + 5 1 0 - 2 + 5 2 - 2 + 5 0 - plugins/DevicesDetection/images/browsers/AN.gif + plugins/DevicesDetection/images/browsers/UNK.gif - + 2 2 1 @@ -70,19 +70,19 @@ 2 2 0 - plugins/DevicesDetection/images/browsers/FF.gif + plugins/DevicesDetection/images/browsers/AN.gif - + 2 2 1 0 2 - 1 + 2 2 0 - plugins/DevicesDetection/images/browsers/UNK.gif + plugins/DevicesDetection/images/browsers/FF.gif 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 d0be913ad26..199e2ae68f2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -2,13 +2,13 @@ - 28 - 32 + 31 + 35 3 548 - 25 - 26 - 27 + 28 + 27 + 30 1 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 cfa85794747..6837e44818e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -1,5 +1,17 @@ + + + 9 + 12 + 3 + 306 + 7 + 8 + 8 + 1 + plugins/DevicesDetection/images/os/MAC.gif + 8 @@ -12,18 +24,6 @@ 0 plugins/DevicesDetection/images/os/LIN.gif - - - 8 - 11 - 3 - 306 - 6 - 7 - 7 - 1 - plugins/DevicesDetection/images/os/MAC.gif - 10 @@ -49,25 +49,25 @@ plugins/DevicesDetection/images/os/AND.gif - - 1 - 1 + + 3 + 3 1 0 - 1 - 1 - 1 + 3 + 0 + 3 0 plugins/DevicesDetection/images/os/UNK.gif - + 1 1 1 0 1 - 0 + 1 1 0 plugins/DevicesDetection/images/os/UNK.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 636ccfdeb77..06b7964798d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -36,6 +36,18 @@ 0 plugins/DevicesDetection/images/os/MAC.gif + + + 3 + 3 + 1 + 0 + 3 + 0 + 3 + 0 + plugins/DevicesDetection/images/os/UNK.gif + 2 @@ -97,7 +109,7 @@ plugins/DevicesDetection/images/os/UNK.gif - + 1 1 1 @@ -109,16 +121,16 @@ plugins/DevicesDetection/images/os/MAC.gif - + 1 1 1 0 1 - 0 + 1 1 0 - plugins/DevicesDetection/images/os/UNK.gif + plugins/DevicesDetection/images/os/MAC.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 e838256d3f2..9e7d544aec7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,16 +2,28 @@ - 26 - 30 + 27 + 31 3 548 - 23 - 25 - 25 + 24 + 26 + 26 1 plugins/DevicesDetection/images/screens/normal.gif + + + 4 + 4 + 1 + 0 + 4 + 1 + 4 + 0 + plugins/DevicesDetection/images/screens/unknown.gif + 3 @@ -24,18 +36,6 @@ 1 plugins/DevicesDetection/images/screens/smartphone.png - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - 0 - plugins/DevicesDetection/images/screens/unknown.gif - 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml index c234bed59e9..3a93f6652bc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml @@ -1,2 +1,38 @@ - \ No newline at end of file + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml index c234bed59e9..23e67434b4f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml @@ -1,2 +1,38 @@ - \ No newline at end of file + + + + 2 + 2 + 0 + 0 + 0 + 0 + 2 + 0 + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml index c234bed59e9..8c2883c098b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml @@ -1,2 +1,51 @@ - \ No newline at end of file + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index 8c1697b2218..f79d26674bd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml @@ -2,7 +2,7 @@ - 28 + 29 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml index 970c5a295dc..1f6c128fbc5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml @@ -2,7 +2,7 @@ - 29 + 30 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml index 35d78ccc178..93be92ec99e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml @@ -1,7 +1,7 @@ - 29 - 29 - 145 - 93.55% + 30 + 30 + 150 + 88.24% \ No newline at end of file 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 ff63b6a32a3..8734e5196a3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -1786,6 +1786,109 @@ + + + 1 + 46 + 192.0.2.10 + + + + goal + all + 1 + 5 + 64 + + http://piwik.net/view/my/file.html + plugins/Morpheus/images/goal.png + + + action + http://piwik.net/view/my/file.html + + 64 + + 64 + + + HTTP-code + 200 + + + 0.001s + + + + 1 + USD + $ + + + + + 0 + 1 + + new + + 1 + plugins/Morpheus/images/goal.png + 1 + + none + + 0 + 0 + 0 + 0s + + + Desktop + Mac + MAC + plugins/DevicesDetection/images/os/MAC.gif + + Unknown + Unknown + Unknown + plugins/DevicesDetection/images/browsers/UNK.gif + UNK + + 0 + Unknown + Unknown + + direct + Direct Entry + + + + + + + Unknown + unk + Unknown + xx + plugins/UserCountry/images/flags/xx.png + + + + Unknown + + + unknown + + + 01:13:11 + 1 + 0 + + + + + 1 @@ -2485,6 +2588,193 @@ + + + 1 + 48 + 192.0.2.222 + + + + event + http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value + 65 + + 66 + cloudfront_rtmp + play + + + HTTP-code + 200 + + + myvideo + plugins/Morpheus/images/event.png + + + 0 + USD + $ + + + + + 0 + 1 + + new + + 0 + + 1 + + none + + 0 + 0 + 0 + 0s + + + Unknown + Unknown + UNK + plugins/DevicesDetection/images/os/UNK.gif + + Unknown + Unknown + Unknown + plugins/DevicesDetection/images/browsers/UNK.gif + UNK + + 1 + Unknown + Unknown + + direct + Direct Entry + + + + + + + Unknown + unk + Unknown + xx + plugins/UserCountry/images/flags/xx.png + + + + Unknown + + + unknown + + + 23:51:21 + 23 + 0 + + + + + + + + 1 + 47 + 192.0.2.147 + + + + event + http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value + 65 + + 65 + cloudfront_rtmp + connect + + + HTTP-code + 200 + + + plugins/Morpheus/images/event.png + + + 0 + USD + $ + + + + + 0 + 1 + + new + + 0 + + 1 + + none + + 0 + 0 + 0 + 0s + + + Unknown + Unknown + UNK + plugins/DevicesDetection/images/os/UNK.gif + + Unknown + Unknown + Unknown + plugins/DevicesDetection/images/browsers/UNK.gif + UNK + + 1 + Unknown + Unknown + + direct + Direct Entry + + + + + + + Unknown + unk + Unknown + xx + plugins/UserCountry/images/flags/xx.png + + + + Unknown + + + unknown + + + 23:51:20 + 23 + 0 + + + + + 1 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 d2edd33b602..275d1499ced 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,10 +2,10 @@ - 31 - 36 - 32 - 145 + 34 + 39 + 33 + 150 100% 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 79b56ff9799..fb7252904eb 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 - 36 + 34 + 39 100% 100% 100% 100% - 32 - 145 + 33 + 150 \ 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 f83cd0a71c0..76382aadab0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -2,13 +2,13 @@ - 31 - 36 + 34 + 39 3 550 - 27 - 29 - 30 + 30 + 30 + 33 2 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 9b5ba79691a..e5e8c8d924e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,22 +2,23 @@ - 29 - 34 + 32 + 37 3 550 - 25 + 28 - 27 - 27 - 135 + 28 + 28 + 140 - 27 - 135 - 28 + 28 + 140 + 31 2 + 0 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 dc702824f12..eca5acdf703 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,22 +2,23 @@ - 26 - 31 + 29 + 34 3 550 - 22 + 25 - 24 - 24 - 120 + 25 + 25 + 125 - 24 - 120 - 25 + 25 + 125 + 28 2 + 0 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 212e81c7859..eeb3aa43cf7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -21,31 +21,32 @@ Asia - - 8 - 9 + + 11 + 12 2 - 3 - 7 + 242 + 10 - 8 - 8 - 40 + 9 + 9 + 45 - 8 - 40 - 7 - 2 - North America + 9 + 45 + 11 + 0 + 0 + Unknown - + 8 9 2 - 242 + 3 7 @@ -56,9 +57,9 @@ 8 40 - 8 - 0 - Unknown + 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 1c82333bf07..b88e3fec304 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -24,34 +24,35 @@ 11 - - 8 - 9 + + 11 + 12 2 - 3 - 7 + 242 + 10 - 8 - 8 - 40 + 9 + 9 + 45 - 8 - 40 - 7 - 2 - us - plugins/UserCountry/images/flags/us.png + 9 + 45 + 11 + 0 + 0 + xx + plugins/UserCountry/images/flags/xx.png 16 11 - + 8 9 2 - 242 + 3 7 @@ -62,10 +63,10 @@ 8 40 - 8 - 0 - xx - plugins/UserCountry/images/flags/xx.png + 7 + 2 + us + plugins/UserCountry/images/flags/us.png 16 11 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 1149b705a7c..e758c3e8aa2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,22 +2,23 @@ - 26 - 31 + 29 + 34 3 550 - 22 + 25 - 24 - 24 - 120 + 25 + 25 + 125 - 24 - 120 - 25 + 25 + 125 + 28 2 + 0 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 147f52ac7c9..f57f78606cd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -22,6 +22,17 @@ 7 0 + + + 5 + 5 + 1 + 0 + 5 + 2 + 5 + 0 + 3 @@ -33,17 +44,6 @@ 2 2 - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - 0 - 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 90f330a5e57..bcc37fcec6a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -36,6 +36,18 @@ 0 plugins/DevicesDetection/images/browsers/CH.gif + + + 5 + 5 + 1 + 0 + 5 + 2 + 5 + 0 + plugins/DevicesDetection/images/browsers/UNK.gif + 2 @@ -96,18 +108,6 @@ 0 plugins/DevicesDetection/images/browsers/FF.gif - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - 0 - plugins/DevicesDetection/images/browsers/UNK.gif - 1 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 82fd2a7603c..d0c894d25c2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -49,19 +49,19 @@ plugins/DevicesDetection/images/browsers/CH.gif - - 2 - 2 + + 5 + 5 1 0 - 2 + 5 2 - 2 + 5 0 - plugins/DevicesDetection/images/browsers/AN.gif + plugins/DevicesDetection/images/browsers/UNK.gif - + 2 2 1 @@ -70,19 +70,19 @@ 2 2 0 - plugins/DevicesDetection/images/browsers/FF.gif + plugins/DevicesDetection/images/browsers/AN.gif - + 2 2 1 0 2 - 1 + 2 2 0 - plugins/DevicesDetection/images/browsers/UNK.gif + plugins/DevicesDetection/images/browsers/FF.gif 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 75d278b51bb..de82b8409f6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -44,6 +44,17 @@ 2 1 + + + 3 + 3 + 1 + 0 + 3 + 0 + 3 + 0 + 2 @@ -111,13 +122,13 @@ 0 - + 1 1 1 0 1 - 0 + 1 1 0 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 8d4b8d074e8..3acd2a06f0f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml @@ -2,13 +2,13 @@ - 31 - 36 + 34 + 39 3 550 - 27 - 29 - 30 + 30 + 30 + 33 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 3ed6ff73098..6405f7bd2d9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -2,13 +2,13 @@ - 31 - 36 + 34 + 39 3 550 - 27 - 29 - 30 + 30 + 30 + 33 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 e838256d3f2..9e7d544aec7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,16 +2,28 @@ - 26 - 30 + 27 + 31 3 548 - 23 - 25 - 25 + 24 + 26 + 26 1 plugins/DevicesDetection/images/screens/normal.gif + + + 4 + 4 + 1 + 0 + 4 + 1 + 4 + 0 + plugins/DevicesDetection/images/screens/unknown.gif + 3 @@ -24,18 +36,6 @@ 1 plugins/DevicesDetection/images/screens/smartphone.png - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - 0 - plugins/DevicesDetection/images/screens/unknown.gif - 0 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 cfa85794747..6837e44818e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -1,5 +1,17 @@ + + + 9 + 12 + 3 + 306 + 7 + 8 + 8 + 1 + plugins/DevicesDetection/images/os/MAC.gif + 8 @@ -12,18 +24,6 @@ 0 plugins/DevicesDetection/images/os/LIN.gif - - - 8 - 11 - 3 - 306 - 6 - 7 - 7 - 1 - plugins/DevicesDetection/images/os/MAC.gif - 10 @@ -49,25 +49,25 @@ plugins/DevicesDetection/images/os/AND.gif - - 1 - 1 + + 3 + 3 1 0 - 1 - 1 - 1 + 3 + 0 + 3 0 plugins/DevicesDetection/images/os/UNK.gif - + 1 1 1 0 1 - 0 + 1 1 0 plugins/DevicesDetection/images/os/UNK.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 636ccfdeb77..06b7964798d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -36,6 +36,18 @@ 0 plugins/DevicesDetection/images/os/MAC.gif + + + 3 + 3 + 1 + 0 + 3 + 0 + 3 + 0 + plugins/DevicesDetection/images/os/UNK.gif + 2 @@ -97,7 +109,7 @@ plugins/DevicesDetection/images/os/UNK.gif - + 1 1 1 @@ -109,16 +121,16 @@ plugins/DevicesDetection/images/os/MAC.gif - + 1 1 1 0 1 - 0 + 1 1 0 - plugins/DevicesDetection/images/os/UNK.gif + plugins/DevicesDetection/images/os/MAC.gif diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml index a96d5feb81e..94bb890a250 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -3,19 +3,19 @@ 2 - 8% + 7% plugins/UserSettings/images/plugins/cookie.gif 2 - 8% + 7% plugins/UserSettings/images/plugins/flash.gif 2 - 8% + 7% plugins/UserSettings/images/plugins/java.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 378996fabca..a8dc2aedb45 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -2,13 +2,13 @@ - 29 - 34 + 32 + 37 3 550 - 25 - 27 - 28 + 28 + 28 + 31 2 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 4de7a18047e..ff49f519f07 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -23,13 +23,13 @@ - 10 - 10 - 11 + 11 + 11 + 12 0 242 - 9 - 10 + 10 + 11 4 @@ -56,7 +56,13 @@ - 0 + 2 + 2 + 2 + 0 + 0 + 2 + 0 7 \ No newline at end of file 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 dc841363a5d..c46f15ceecd 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -13,13 +13,13 @@ - 0 - 0 - 0 + 1 + 1 + 1 0 - 0 - 0 - 0 + 1 + 1 + 1 0 @@ -255,13 +255,13 @@ - 0 - 0 - 0 + 2 + 2 + 1 0 - 0 + 2 0 - 0 + 2 0 \ No newline at end of file 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 144d6c42217..78e6f4a1984 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -13,14 +13,23 @@ - 0 - 0 - 0 + 1 + 1 + 1 0 - 0 + 1 0 - 0 + 1 0 + + + 1 + 1 + 5 + + + 1 + 5 @@ -363,13 +372,13 @@ - 0 - 0 - 0 + 2 + 2 + 1 0 - 0 + 2 0 - 0 + 2 0 \ No newline at end of file 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 005a1842ab8..08e1ba14747 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,7 +2,7 @@ - 29 + 32 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 a66c195749e..6ed9ca578ed 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,7 +2,7 @@ - 33 + 36 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml index dcd45b3a61f..e841131a550 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,7 +2,7 @@ - 31 + 34 100% diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml index 768a0961d2e..debbd57d3ca 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,13 +2,13 @@ - 37 - 84% + 40 + 85% 2 - 5% + 4% @@ -23,7 +23,7 @@ 2 - 5% + 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 c00b8e2c507..a564cebf19c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,7 +2,7 @@ - 27 + 30 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 95adfb7f9a3..1680ea4eddc 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -2,7 +2,7 @@ - 36 + 39 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index 1f6410e0795..c6fee8cb763 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -2,7 +2,7 @@ - 28 + 31 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml index c53cacde6f0..06c54655553 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -2,7 +2,7 @@ - 38 + 41 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 8af80c337fc..f24432d1a4c 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 @@ -36 \ No newline at end of file +39 \ 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 40bd2e592a5..3fb94696674 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 @@ -27 \ No newline at end of file +30 \ 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 3fb94696674..95aa700980f 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 @@ -30 \ No newline at end of file +33 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml index 46af1425a39..3fb94696674 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml @@ -1,2 +1,2 @@ -29 \ No newline at end of file +30 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 51c650b8b2b..5c61a821373 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml @@ -1,2 +1,2 @@ -31 \ No newline at end of file +34 \ 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 1772684d5e1..dafccfd4dde 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 @@ - 30 + 33 2 - 31 - 36 - 29 - 27 + 34 + 39 + 30 + 30 550 3 - 87% - 1.2 - 18 + 88% + 1.1 + 16 \ 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 bce2027e1c7..96ce816d2eb 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 @@ -3,11 +3,11 @@ - 31 - 36 - 32 - 145 - 29 + 34 + 39 + 33 + 150 + 30 100% 100% 100% @@ -42,11 +42,11 @@ 10 5 1 - -96.8% - -72.2% - -68.8% - -96.6% - -96.6% + -97.1% + -74.4% + -69.7% + -96.7% + -96.7% http://piwik.net 1 diff --git a/tests/resources/access-logs/fake_logs_cloudfront.log b/tests/resources/access-logs/fake_logs_cloudfront.log new file mode 100644 index 00000000000..9892dc36af6 --- /dev/null +++ b/tests/resources/access-logs/fake_logs_cloudfront.log @@ -0,0 +1,3 @@ +#Version: 1.0 +#Fields: date time x-edge-location sc-bytes c-ip cs-method cs(Host) cs-uri-stem sc-status cs(Referer) cs(User-Agent) cs-uri-query cs(Cookie) x-edge-result-type x-edge-request-id x-host-header cs-protocol cs-bytes time-taken +2012-08-23 01:13:11 FRA2 182 192.0.2.10 GET d111111abcdef8.cloudfront.net /view/my/file.html 200 www.displaymyfiles.com Mozilla/4.0%20(compatible;%20MSIE%205.0b1;%20Mac_PowerPC) - zip=98101 RefreshHit MRVMF7KydIvxMWfJIglgwHQwZsbG2IhRJ07sn9AkKUFSHS9EXAMPLE== d111111abcdef8.cloudfront.net http - 0.001 diff --git a/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log b/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log new file mode 100644 index 00000000000..117d747b403 --- /dev/null +++ b/tests/resources/access-logs/fake_logs_cloudfront_rtmp.log @@ -0,0 +1,4 @@ +#Version: 1.0 +#Fields: date time x-edge-location c-ip x-event sc-bytes x-cf-status x-cf-client-id cs-uri-stem cs-uri-query c-referrer x-page-url​ c-user-agent x-sname x-sname-query x-file-ext x-sid +2012-08-12 23:51:20 SEA4 192.0.2.147 connect 2014 OK bfd8a98bee0840d9b871b7f6ade9908f rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st​ key=value http://player.longtailvideo.com/player.swf http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204 LNX%2010,0,32,18 - - - - +2012-08-12 23:51:21 SEA4 192.0.2.222 play 3914 OK bfd8a98bee0840d9b871b7f6ade9908f rtmp://shqshne4jdp4b6.cloudfront.net/cfx/st​ key=value http://player.longtailvideo.com/player.swf http://www.longtailvideo.com/support/jw-player-setup-wizard?example=204 LNX%2010,0,32,18 myvideo p=2&q=4 flv 1