From fa367aa6dc0a65ea9f776fd04a23cacd8e8038f8 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Sun, 7 Dec 2014 21:38:44 -0800 Subject: Refs #6795, add --iis-map-field option to allow users of log importer script to parse log files created using the IIS Advanced Logging module. Includes tests for such a case (including python unit test + PHP System test). --- misc/log-analytics/import_logs.py | 73 ++++- misc/log-analytics/tests/logs/iis_custom.log | 7 + misc/log-analytics/tests/tests.py | 86 +++++- tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | 18 ++ tests/PHPUnit/Framework/Fixture.php | 16 +- tests/PHPUnit/System/ImportLogsTest.php | 3 +- ...mportLogs__Actions.getEntryPageTitles_month.xml | 63 ++++- ...mportLogs__Actions.getEntryPageTitles_range.xml | 103 ++++--- ..._ImportLogs__Actions.getEntryPageUrls_month.xml | 118 ++++++++ ..._ImportLogs__Actions.getEntryPageUrls_range.xml | 130 +++++++++ ...ImportLogs__Actions.getExitPageTitles_month.xml | 80 +++++- ...ImportLogs__Actions.getExitPageTitles_range.xml | 122 +++++--- ...t_ImportLogs__Actions.getExitPageUrls_month.xml | 118 ++++++++ ...t_ImportLogs__Actions.getExitPageUrls_range.xml | 130 +++++++++ ...est_ImportLogs__Actions.getPageTitles_month.xml | 97 ++++--- ...est_ImportLogs__Actions.getPageTitles_range.xml | 137 +++++---- .../test_ImportLogs__Actions.getPageUrls_month.xml | 118 ++++++++ .../test_ImportLogs__Actions.getPageUrls_range.xml | 130 +++++++++ .../test_ImportLogs__Actions.get_month.xml | 4 +- .../test_ImportLogs__Actions.get_range.xml | 4 +- ...s__CustomVariables.getCustomVariables_month.xml | 24 +- ...ImportLogs__DevicesDetection.getBrand_month.xml | 22 +- ...s__DevicesDetection.getBrowserEngines_month.xml | 11 + ...__DevicesDetection.getBrowserFamilies_month.xml | 36 ++- ...__DevicesDetection.getBrowserVersions_month.xml | 36 +++ ...ortLogs__DevicesDetection.getBrowsers_month.xml | 36 ++- ...ImportLogs__DevicesDetection.getModel_month.xml | 21 +- ...tLogs__DevicesDetection.getOsFamilies_month.xml | 34 +-- ...tLogs__DevicesDetection.getOsVersions_month.xml | 24 ++ ..._ImportLogs__DevicesDetection.getType_month.xml | 30 +- ...ImportLogs__Goals.getDaysToConversion_month.xml | 2 +- ...tLogs__Goals.getVisitsUntilConversion_month.xml | 2 +- .../expected/test_ImportLogs__Goals.get_month.xml | 8 +- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 306 +++++++++++++++++++++ .../test_ImportLogs__MultiSites.getAll_month.xml | 8 +- .../test_ImportLogs__MultiSites.getOne_month.xml | 8 +- ...test_ImportLogs__Provider.getProvider_month.xml | 10 +- ...ImportLogs__Referrers.getReferrerType_month.xml | 18 +- .../test_ImportLogs__UserCountry.getCity_month.xml | 18 +- ..._ImportLogs__UserCountry.getContinent_month.xml | 40 +-- ...st_ImportLogs__UserCountry.getCountry_month.xml | 46 ++-- ...est_ImportLogs__UserCountry.getRegion_month.xml | 18 +- ...portLogs__UserSettings.getBrowserType_month.xml | 11 + ...tLogs__UserSettings.getBrowserVersion_month.xml | 36 +++ ...t_ImportLogs__UserSettings.getBrowser_month.xml | 36 ++- ...rtLogs__UserSettings.getConfiguration_month.xml | 17 +- ...ortLogs__UserSettings.getLanguageCode_month.xml | 10 +- ..._ImportLogs__UserSettings.getLanguage_month.xml | 10 +- ...Logs__UserSettings.getMobileVsDesktop_month.xml | 30 +- ..._ImportLogs__UserSettings.getOSFamily_month.xml | 34 +-- .../test_ImportLogs__UserSettings.getOS_month.xml | 24 ++ ...st_ImportLogs__UserSettings.getPlugin_month.xml | 14 +- ...mportLogs__UserSettings.getResolution_month.xml | 10 +- ..._ImportLogs__VisitTime.getByDayOfWeek_month.xml | 10 +- ...tTime.getVisitInformationPerLocalTime_month.xml | 10 +- ...Time.getVisitInformationPerServerTime_month.xml | 18 +- ...rest.getNumberOfVisitsByDaysSinceLast_month.xml | 2 +- ...rest.getNumberOfVisitsByDaysSinceLast_range.xml | 2 +- ...nterest.getNumberOfVisitsByVisitCount_month.xml | 2 +- ...nterest.getNumberOfVisitsByVisitCount_range.xml | 10 +- ...itorInterest.getNumberOfVisitsPerPage_month.xml | 2 +- ...itorInterest.getNumberOfVisitsPerPage_range.xml | 2 +- ...est.getNumberOfVisitsPerVisitDuration_month.xml | 2 +- ...est.getNumberOfVisitsPerVisitDuration_range.xml | 2 +- ..._ImportLogs__VisitsSummary.getActions_month.xml | 2 +- ...ortLogs__VisitsSummary.getBounceCount_month.xml | 2 +- ...Logs__VisitsSummary.getUniqueVisitors_month.xml | 2 +- ...ogs__VisitsSummary.getVisitsConverted_month.xml | 2 +- ...t_ImportLogs__VisitsSummary.getVisits_month.xml | 2 +- .../test_ImportLogs__VisitsSummary.get_month.xml | 12 +- ...thEnhancedAndLast7__MultiSites.getAll_month.xml | 20 +- .../resources/access-logs/fake_logs_custom_iis.log | 7 + 72 files changed, 2165 insertions(+), 493 deletions(-) create mode 100644 misc/log-analytics/tests/logs/iis_custom.log create mode 100644 tests/resources/access-logs/fake_logs_custom_iis.log diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 7b46ea3e11..8d5afccc17 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -189,37 +189,46 @@ class RegexFormat(BaseFormat): class IisFormat(RegexFormat): + fields = { + 'date': '(?P^\d+[-\d+]+', + 'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together + 'cs-uri-stem': '(?P/\S*)', + 'cs-uri-query': '(?P\S*)', + 'c-ip': '"?(?P[\d*.]*)"?', + 'cs(User-Agent)': '(?P".*?"|\S+)', # TODO: must remove quotes if found. also benchmark regex. + 'cs(Referer)': '(?P\S+)', + 'sc-status': '(?P\d+)', + 'sc-bytes': '(?P\S+)', + 'cs-host': '(?P\S+)', + } + def __init__(self): super(IisFormat, self).__init__('iis', None, '%Y-%m-%d %H:%M:%S') def check_format(self, file): line = file.readline() - if not line.startswith('#Software: Microsoft Internet Information Services '): + if not line.startswith('#'): file.seek(0) return + # Skip the next 2 lines. for i in xrange(2): file.readline() - # Parse the 4th line (regex) + + # Parse the 4th 'Fields: ' line to create the regex to use full_regex = [] line = file.readline() - fields = { - 'date': '(?P^\d+[-\d+]+', - 'time': '[\d+:]+)', - 'cs-uri-stem': '(?P/\S*)', - 'cs-uri-query': '(?P\S*)', - 'c-ip': '(?P[\d*.]*)', - 'cs(User-Agent)': '(?P\S+)', - 'cs(Referer)': '(?P\S+)', - 'sc-status': '(?P\d+)', - 'sc-bytes': '(?P\S+)', - 'cs-host': '(?P\S+)', - } + + expected_fields = IisFormat.fields.copy() # turn custom field mapping into field => regex mapping + for mapped_field_name, field_name in config.options.custom_iis_fields.iteritems(): + expected_fields[mapped_field_name] = IisFormat.fields[field_name] + del expected_fields[field_name] + # Skip the 'Fields: ' prefix. line = line[9:] for field in line.split(): try: - regex = fields[field] + regex = expected_fields[field] except KeyError: regex = '\S+' full_regex.append(regex) @@ -485,8 +494,31 @@ class Configuration(object): '--download-extensions', dest='download_extensions', default=None, help="By default Piwik tracks as Downloads the most popular file extensions. If you set this parameter (format: pdf,doc,...) then files with an extension found in the list will be imported as Downloads, other file extensions downloads will be skipped." ) + option_parser.add_option( + '--iis-map-field', action='callback', callback=self._set_iis_field_map, type='string', + help="Map a custom log entry field in your IIS log to a default one. Use this option to load custom IIS log " + "files such as those from the Advanced Logging IIS module. Used as, eg, --iis-map-field my-date=date. " + "Recognized default fields include: %s" % (', '.join(IisFormat.fields.keys())) + ) return option_parser + def _set_iis_field_map(self, option, opt_str, value, parser): + parts = value.split('=') + + if len(parts) != 2: + fatal_error("Invalid --iis-map-field option: '%s'" % value) + + custom_name, default_name = parts + + if default_name not in IisFormat.fields: + fatal_error("custom IIS field mapping error: don't know how to parse and use the '%' field" % default_name) + return + + if not hasattr(parser.values, 'custom_iis_fields'): + parser.values.custom_iis_fields = {} + + parser.values.custom_iis_fields[custom_name] = default_name + def _parse_args(self, option_parser): """ Parse the command line args and create self.options and self.filenames. @@ -500,6 +532,9 @@ class Configuration(object): print(option_parser.format_help()) sys.exit(1) + if not hasattr(self.options, 'custom_iis_fields'): + self.options.custom_iis_fields = {} + # Configure logging before calling logging.{debug,info}. logging.basicConfig( format='%(asctime)s: [%(levelname)s] %(message)s', @@ -1507,6 +1542,9 @@ class Parser(object): limit = 100000 while not format and lineno < limit: line = file.readline() + if not line: # if at eof, don't keep looping + break + lineno = lineno + 1 logging.debug("Detecting format against line %i" % lineno) @@ -1625,6 +1663,11 @@ class Parser(object): try: hit.user_agent = format.get('user_agent') + + # in case a format parser included enclosing quotes, remove them so they are not + # sent to Piwik + if hit.user_agent.startswith('"'): + hit.user_agent = hit.user_agent[1:-1] except BaseFormatException: hit.user_agent = '' diff --git a/misc/log-analytics/tests/logs/iis_custom.log b/misc/log-analytics/tests/logs/iis_custom.log new file mode 100644 index 0000000000..73797b64dd --- /dev/null +++ b/misc/log-analytics/tests/logs/iis_custom.log @@ -0,0 +1,7 @@ +#Software: IIS Advanced Logging Module +#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.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 diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index 37af5eee8f..7659afdaff 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -1,6 +1,7 @@ # vim: et sw=4 ts=4: import functools import os +import datetime import import_logs @@ -23,6 +24,7 @@ def tearDownModule(): def test_format_detection(): def _test(format_name): file = open('logs/%s.log' % format_name) + import_logs.config = Config() format = import_logs.Parser.detect_format(file) assert(format is not None) assert(format.name == format_name) @@ -31,6 +33,7 @@ def test_format_detection(): tmp_path = add_junk_to_file('logs/%s.log' % format_name) file = open(tmp_path) + import_logs.config = Config() format = import_logs.Parser.detect_format(file) assert(format is not None) assert(format.name == format_name) @@ -64,6 +67,7 @@ class Options(object): included_paths = [] enable_http_errors = False download_extensions = 'doc,pdf' + custom_iis_fields = {} class Config(object): """Mock configuration.""" @@ -183,6 +187,8 @@ def test_replay_tracking_arguments(): def parse_log_file_line(format_name, file_): format = import_logs.FORMATS[format_name] + import_logs.config.options.custom_iis_fields = {} + file = open(file_) match = format.check_format(file) file.close() @@ -277,10 +283,88 @@ def test_format_parsing(): yield f f = functools.partial(_test_with_junk, format_name, 'logs/' + format_name + '.log') - f.description = 'Testing parsin of format "%s" with junk appended to path' % format_name + f.description = 'Testing parsing of format "%s" with junk appended to path' % format_name yield f f = functools.partial(_test, 'common', 'logs/ncsa_extended.log') f.description = 'Testing parsing of format "common" with ncsa_extended log' yield f + +def test_iis_custom_format(): + """test IIS custom format name parsing.""" + + file_ = 'logs/iis_custom.log' + + # have to override previous globals override for this test + import_logs.config.options.custom_iis_fields = { + 'date-local': 'date', + 'time-local': 'time', + 'cs(Host)': 'cs-host' + } + Recorder.recorders = [] + import_logs.parser = import_logs.Parser() + import_logs.config.format = None + 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.parser.parse(file_) + + hits = [hit.__dict__ for hit in Recorder.recorders] + + assert hits[0]['status'] == '200' + assert hits[0]['is_error'] == False + assert hits[0]['extension'] == u'/products/theproduct' + assert hits[0]['is_download'] == False + assert hits[0]['referrer'] == u'"http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en"' + assert hits[0]['args'] == {} + assert hits[0]['generation_time_milli'] == 0 + assert hits[0]['host'] == 'foo' + assert hits[0]['filename'] == 'logs/iis_custom.log' + assert hits[0]['is_redirect'] == False + assert hits[0]['date'] == datetime.datetime(2012, 8, 15, 17, 0) + assert hits[0]['lineno'] == 4 + assert hits[0]['ip'] == u'70.95.0.0' + assert hits[0]['query_string'] == '' + assert hits[0]['path'] == u'/Products/theProduct' + assert hits[0]['is_robot'] == False + assert hits[0]['full_path'] == u'/Products/theProduct' + assert hits[0]['user_agent'] == u'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' + + assert hits[1]['status'] == u'301' + assert hits[1]['is_error'] == False + assert hits[1]['extension'] == u'/topic/hw43061' + assert hits[1]['is_download'] == False + assert hits[1]['referrer'] == '' + assert hits[1]['args'] == {} + assert hits[1]['generation_time_milli'] == 0 + assert hits[1]['host'] == 'foo' + assert hits[1]['filename'] == 'logs/iis_custom.log' + assert hits[1]['is_redirect'] == True + assert hits[1]['date'] == datetime.datetime(2012, 8, 15, 17, 0) + assert hits[1]['lineno'] == 5 + assert hits[1]['ip'] == '70.95.32.0' + assert hits[1]['query_string'] == '' + assert hits[1]['path'] == u'/Topic/hw43061' + assert hits[1]['is_robot'] == False + assert hits[1]['full_path'] == u'/Topic/hw43061' + assert hits[1]['user_agent'] == u'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' + + assert hits[2]['status'] == u'404' + assert hits[2]['is_error'] == True + assert hits[2]['extension'] == u'/hello/world/6,681965' + assert hits[2]['is_download'] == False + assert hits[2]['referrer'] == '' + assert hits[2]['args'] == {} + assert hits[2]['generation_time_milli'] == 0 + assert hits[2]['host'] == 'foo' + assert hits[2]['filename'] == 'logs/iis_custom.log' + assert hits[2]['is_redirect'] == False + assert hits[2]['date'] == datetime.datetime(2012, 8, 15, 17, 0) + assert hits[2]['lineno'] == 6 + assert hits[2]['ip'] == u'173.5.0.0' + assert hits[2]['query_string'] == '' + assert hits[2]['path'] == u'/hello/world/6,681965' + assert hits[2]['is_robot'] == False + assert hits[2]['full_path'] == u'/hello/world/6,681965' + assert hits[2]['user_agent'] == u'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' diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index e72708a11d..326eded8b4 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -27,6 +27,7 @@ class ManySitesImportedLogs extends Fixture public $segments = null; // should be array mapping segment name => segment definition public $addSegments = false; + public $includeIisWithCustom = false; public static function createAccessInstance() { @@ -111,6 +112,10 @@ class ManySitesImportedLogs extends Fixture $this->logVisitsWithAllEnabled(); $this->replayLogFile(); $this->logCustomFormat(); + + if ($this->includeIisWithCustom) { + $this->logIisWithCustomFormat(); + } } private function setupSegments() @@ -229,4 +234,17 @@ class ManySitesImportedLogs extends Fixture self::executeLogImporter($logFile, $opts); } + + private function logIisWithCustomFormat() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_custom_iis.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth(), + '--iis-map-field' => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host'), + '--enable-http-errors' => false, + '--enable-http-redirects' => false,); + + 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 693b76e280..a2d6a6327a 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -758,12 +758,18 @@ class Fixture extends \PHPUnit_Framework_Assert . '--url="' . self::getRootUrl() . 'tests/PHPUnit/proxy/" ' # proxy so that piwik uses test config files ; - foreach ($options as $name => $value) { - $cmd .= $name; - if ($value !== false) { - $cmd .= '="' . $value . '"'; + foreach ($options as $name => $values) { + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $value) { + $cmd .= $name; + if ($value !== false) { + $cmd .= '="' . $value . '"'; + } + $cmd .= ' '; } - $cmd .= ' '; } $cmd .= '"' . $logFile . '" 2>&1'; diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index 44c6b7b0b9..ae98fff219 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -102,4 +102,5 @@ class ImportLogsTest extends SystemTestCase } } -ImportLogsTest::$fixture = new ManySitesImportedLogs(); \ No newline at end of file +ImportLogsTest::$fixture = new ManySitesImportedLogs(); +ImportLogsTest::$fixture->includeIisWithCustom = true; \ No newline at end of file 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 77e2b64918..6bddc34c80 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -2,16 +2,17 @@ - 1 - 1 + 2 + 2 180 - 1 - 2 + 2 + 3 182 - 0 - 180 - 0% - 0% + 1 + 1 + 90 + 50% + 50% @@ -28,22 +29,56 @@ 0% 0% + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 100% 100% + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 1 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 2d81bb9f19..34ede98abf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -22,41 +22,21 @@ 0.177 - + 2 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - - - - 1 - 1 180 0 0 - 1 - 2 + 2 + 3 182 - 0 - 180 - 0% - 0% + 1 + 1 + 90 + 50% + 50% 0 @@ -74,26 +54,60 @@ 0% 0% + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + - 1 - 1 + 2 + 2 0 0 0 - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 100% 100% 0 + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 1 @@ -113,6 +127,27 @@ + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + 1 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 8845a80655..571104d49e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -508,6 +508,56 @@ + + + 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 @@ -610,6 +660,40 @@ + + + 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 @@ -772,6 +856,40 @@ + + + 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 b7cbdc125b..276835546d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -885,6 +885,60 @@ + + + 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 @@ -999,6 +1053,44 @@ + + + 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 @@ -1165,6 +1257,44 @@ + + + 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 f1b90a5e1d..359024222a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -1,43 +1,69 @@ - - 1 - 1 - 0 + + 2 + 2 + 180 + 2 + 3 + 182 + 1 1 - 0 - 0% - 100% + 90 + 50% + 50% - + 1 1 0 + 1 + 1 + 0 + 1 1 1 + 1 1 0 - 0% + 100% 100% - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 100% 100% + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 1 @@ -57,6 +83,30 @@ + + + 1 + 1 + 0 + 1 + 0 + 0% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 0% + 100% + + + 1 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 867e27cd0d..e92f88170b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -22,72 +22,77 @@ 0.177 - + 2 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - - - - 1 - 1 - 0 + 180 0 0 + 2 + 3 + 182 + 1 1 - 0 - 0% - 100% + 90 + 50% + 50% 0 - + 1 1 0 + 1 + 1 + 0 + 1 1 1 + 1 1 0 - 0% + 100% 100% - 1 - 1 + 2 + 2 0 0 0 - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 100% 100% 0 + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 1 @@ -107,6 +112,55 @@ + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 0% + 100% + + + 1 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 28acca1242..73eb0a4e7b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -505,6 +505,56 @@ + + + 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 @@ -607,6 +657,40 @@ + + + 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 @@ -769,6 +853,40 @@ + + + 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.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index 7721a10da1..9c72bb4a22 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -876,6 +876,60 @@ + + + 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 @@ -990,6 +1044,44 @@ + + + 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 @@ -1156,6 +1248,44 @@ + + + 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.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 143229b5e7..c2d09b9558 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -2,26 +2,27 @@ - 20 - 20 + 21 + 21 0 - 20 + 21 0 0% 0% - 1 - 1 + 2 + 2 180 - 1 - 2 + 2 + 3 182 - 0 - 180 - 0% - 0% + 1 + 1 + 90 + 50% + 50% @@ -38,46 +39,56 @@ 0% 0% - - - - - 1 - 1 - 0 - 1 - 0 - 0% - 100% - - + 1 1 0 + 1 + 1 + 0 + 1 1 1 + 1 1 0 - 0% + 100% 100% - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 - 1 - 1 + 2 + 2 0 100% 100% + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 1 @@ -97,6 +108,30 @@ + + + 1 + 1 + 0 + 1 + 0 + 0% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 0% + 100% + + + 1 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 509723308f..748064246b 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 @@ - 21 - 30 + 22 + 31 0 10 0.023 1.324 - 21 + 22 0 0% 0% @@ -36,41 +36,21 @@ 0.177 - + 2 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - - - - 1 - 1 180 0 0 - 1 - 2 + 2 + 3 182 - 0 - 180 - 0% - 0% + 1 + 1 + 90 + 50% + 50% 0 @@ -88,69 +68,124 @@ 0% 0% + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + - - 1 - 1 + + 2 + 2 0 0 0 - 1 + 2 + 2 + 0 + 2 + 2 0 - 0% + 100% 100% 0 - + 1 1 0 + 1 + 1 + 0 + 1 1 1 + 1 1 0 - 0% + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% 100% - + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + 1 1 0 0 0 - 1 - 1 - 0 - 1 1 0 - 100% + 0% 100% 0 - + 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 c3f7304c25..8a94ddc971 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -521,6 +521,56 @@ + + + 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 @@ -623,6 +673,40 @@ + + + 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 @@ -785,6 +869,40 @@ + + + 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.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index aaabfb8fc3..1331341d0e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -950,6 +950,60 @@ + + + 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 @@ -1064,6 +1118,44 @@ + + + 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 @@ -1230,6 +1322,44 @@ + + + 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.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml index c8388c1f4d..8ea3b42ae1 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 @@ - 26 - 26 + 29 + 29 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 a87ec05ee3..d6fa032f4d 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 @@ - 50 - 44 + 53 + 47 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 6f8a9a4c98..5deb55d67b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,28 +2,28 @@ - 29 + 32 - 23 - 25 - 23 + 24 + 26 + 24 - 1 - 1 - 1 + 2 + 2 + 2 - - 1 - 1 - 1 + + 2 + 2 + 2 - + 1 1 1 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 38d80d2b64..2fa0bdd6a2 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 @@ - 25 - 28 + 27 + 30 3 305 - 23 - 23 - 25 + 25 + 25 + 27 0 plugins/DevicesDetection/images/brand/Unknown.ico @@ -24,4 +24,16 @@ 0 plugins/DevicesDetection/images/brand/HTC.ico + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 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 bb6679c971..327a80e10d 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 @@ 6 0 + + + 3 + 3 + 1 + 0 + 3 + 3 + 3 + 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 8723d1a05f..11bca766d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -1,5 +1,17 @@ + + + 7 + 7 + 1 + 0 + 7 + 7 + 7 + 0 + plugins/UserSettings/images/browsers/CH.gif + 6 @@ -12,18 +24,6 @@ 0 plugins/UserSettings/images/browsers/IE.gif - - - 5 - 5 - 1 - 0 - 5 - 5 - 5 - 0 - plugins/UserSettings/images/browsers/CH.gif - 5 @@ -84,4 +84,16 @@ 0 plugins/UserSettings/images/browsers/UNK.gif + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 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 80d06470a3..e87b26d95f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -108,6 +108,42 @@ 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 + 1 + 1 + 0 + plugins/UserSettings/images/browsers/CM.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 8723d1a05f..11bca766d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -1,5 +1,17 @@ + + + 7 + 7 + 1 + 0 + 7 + 7 + 7 + 0 + plugins/UserSettings/images/browsers/CH.gif + 6 @@ -12,18 +24,6 @@ 0 plugins/UserSettings/images/browsers/IE.gif - - - 5 - 5 - 1 - 0 - 5 - 5 - 5 - 0 - plugins/UserSettings/images/browsers/CH.gif - 5 @@ -84,4 +84,16 @@ 0 plugins/UserSettings/images/browsers/UNK.gif + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 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 b9bf650ebc..caab5513f5 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 @@ - 25 - 28 + 27 + 30 3 305 - 23 - 23 - 25 + 25 + 25 + 27 0 @@ -22,4 +22,15 @@ 2 0 + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + \ 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 62d091d83d..540b36d936 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -12,6 +12,18 @@ 0 plugins/UserSettings/images/os/LIN.gif + + + 8 + 11 + 3 + 305 + 6 + 7 + 8 + 0 + plugins/UserSettings/images/os/MAC.gif + 9 @@ -24,27 +36,15 @@ 0 plugins/UserSettings/images/os/WI7.gif - - - 6 - 9 - 3 - 305 - 4 - 5 - 6 - 0 - plugins/UserSettings/images/os/MAC.gif - - 2 - 2 + 3 + 3 1 0 - 2 - 2 - 2 + 3 + 3 + 3 0 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 7cad47e0a1..e9ef7d5e25 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -48,6 +48,18 @@ 0 plugins/UserSettings/images/os/AND.gif + + + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + plugins/UserSettings/images/os/MAC.gif + 2 @@ -60,6 +72,18 @@ 0 plugins/UserSettings/images/os/WXP.gif + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + plugins/UserSettings/images/os/AND.gif + 1 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 0a059a62d6..783076988c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,39 +2,39 @@ - 23 - 26 + 25 + 28 3 305 - 21 - 22 - 23 + 23 + 24 + 25 0 plugins/DevicesDetection/images/screens/normal.gif - - 2 - 2 + + 3 + 3 1 0 - 2 - 1 - 2 + 3 + 3 + 3 0 - plugins/DevicesDetection/images/screens/unknown.gif + plugins/DevicesDetection/images/screens/smartphone.png - + 2 2 1 0 2 - 2 + 1 2 0 - plugins/DevicesDetection/images/screens/smartphone.png + plugins/DevicesDetection/images/screens/unknown.gif 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 1ba1449d50..485a73a99d 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 @@ - 24 + 27 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 0a94d5f36d..d1e9091dc3 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 @@ - 25 + 28 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 4c6855264a..6a201ece3a 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 @@ - 25 - 25 - 125 - 92.59% + 28 + 28 + 140 + 93.33% \ 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 93c0819d6c..7b38717520 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,312 @@ + + + 1 + 42 + 70.95.0.0 + + + + goal + all + 1 + 5 + 58 + + http://piwik.net/Products/theProduct + plugins/Morpheus/images/goal.png + + + action + http://piwik.net/Products/theProduct + + 55 + + 58 + + + HTTP-code + 200 + + + + + + 1 + USD + $ + + + + + 0 + 1 + + new + + 1 + plugins/Morpheus/images/goal.png + 1 + + none + + 0 + 0 + 0 + 0s + + + Smartphone + Android + AND + plugins/UserSettings/images/os/AND.gif + Blink + Blink (Chrome, Opera) + Chrome Mobile 39.0 + Chrome Mobile + plugins/UserSettings/images/browsers/CM.gif + CM + 39.0 + 0 + Unknown + Unknown + + direct + Direct Entry + + + + + + + North America + amn + United States + us + plugins/UserCountry/images/flags/us.png + + + + United States + 38 + -97 + unknown + + + 17:00:00 + 17 + 0 + + + + + + + + 1 + 43 + 70.95.32.0 + + + + goal + all + 1 + 5 + 59 + + http://piwik.net/Topic/hw43061 + plugins/Morpheus/images/goal.png + + + action + http://piwik.net/Topic/hw43061 + 301/URL = http%3A%2F%2Fpiwik.net%2FTopic%2Fhw43061 + 57 + + 59 + + + HTTP-code + 301 + + + + + + 1 + USD + $ + + + + + 0 + 1 + + new + + 1 + plugins/Morpheus/images/goal.png + 1 + + none + + 0 + 0 + 0 + 0s + + + Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif + Blink + Blink (Chrome, Opera) + Chrome 41.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 41.0 + 0 + Unknown + Unknown + + direct + Direct Entry + + + + + + + North America + amn + United States + us + plugins/UserCountry/images/flags/us.png + + + + United States + 38 + -97 + unknown + + + 17:00:00 + 17 + 0 + + + + + + + + 1 + 44 + 173.5.0.0 + + + + goal + all + 1 + 5 + 60 + + http://piwik.net/hello/world/6,681965 + plugins/Morpheus/images/goal.png + + + action + http://piwik.net/hello/world/6,681965 + 404/URL = http%3A%2F%2Fpiwik.net%2Fhello%2Fworld%2F6%2C681965 + 59 + + 60 + + + HTTP-code + 404 + + + + + + 1 + USD + $ + + + + + 0 + 1 + + new + + 1 + plugins/Morpheus/images/goal.png + 1 + + none + + 0 + 0 + 0 + 0s + + + Desktop + Mac + MAC + plugins/UserSettings/images/os/MAC.gif + Blink + Blink (Chrome, Opera) + Chrome 37.0 + Chrome + plugins/UserSettings/images/browsers/CH.gif + CH + 37.0 + 0 + Unknown + Unknown + + direct + Direct Entry + + + + + + + North America + amn + United States + us + plugins/UserCountry/images/flags/us.png + + + + United States + 38 + -97 + unknown + + + 17:00:00 + 17 + 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 eb2209a224..a28ca5d931 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 @@ - 27 - 30 - 26 - 125 + 30 + 33 + 29 + 140 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 1fb93e2a2a..23fff27538 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 @@ - 27 - 30 + 30 + 33 100% 100% 100% 100% - 26 - 125 + 29 + 140 \ 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 8cc6494492..7b9d3fe496 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 @@ - 27 - 30 + 30 + 33 3 305 - 25 - 25 - 27 + 28 + 28 + 30 0 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 80a6349ac1..32aa8bed30 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,21 +2,21 @@ - 25 - 28 + 28 + 31 3 305 - 23 + 26 - 23 - 23 - 115 + 26 + 26 + 130 - 23 - 115 - 25 + 26 + 130 + 28 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 a14f0cec91..78d72bc110 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,21 +2,21 @@ - 22 - 25 + 25 + 28 3 305 - 20 + 23 - 20 - 20 - 100 + 23 + 23 + 115 - 20 - 100 - 22 + 23 + 115 + 25 0 Unknown 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 23e244b751..0e38b2873c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -20,6 +20,26 @@ 0 Asia + + + 8 + 8 + 1 + 0 + 8 + + + 8 + 8 + 40 + + + 8 + 40 + 8 + 0 + North America + 7 @@ -40,26 +60,6 @@ 0 Unknown - - - 5 - 5 - 1 - 0 - 5 - - - 5 - 5 - 25 - - - 5 - 25 - 5 - 0 - North America - 3 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 ce5523efde..a0f51627f5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -23,6 +23,29 @@ 16 11 + + + 8 + 8 + 1 + 0 + 8 + + + 8 + 8 + 40 + + + 8 + 40 + 8 + 0 + us + plugins/UserCountry/images/flags/us.png + 16 + 11 + 7 @@ -46,29 +69,6 @@ 16 11 - - - 5 - 5 - 1 - 0 - 5 - - - 5 - 5 - 25 - - - 5 - 25 - 5 - 0 - us - plugins/UserCountry/images/flags/us.png - 16 - 11 - 3 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 4067fb2618..f9c0be1893 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,21 +2,21 @@ - 22 - 25 + 25 + 28 3 305 - 20 + 23 - 20 - 20 - 100 + 23 + 23 + 115 - 20 - 100 - 22 + 23 + 115 + 25 0 xx xx 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 bb6679c971..327a80e10d 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 @@ 6 0 + + + 3 + 3 + 1 + 0 + 3 + 3 + 3 + 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 80d06470a3..e87b26d95f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -108,6 +108,42 @@ 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 + 1 + 1 + 0 + plugins/UserSettings/images/browsers/CM.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 8723d1a05f..11bca766d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -1,5 +1,17 @@ + + + 7 + 7 + 1 + 0 + 7 + 7 + 7 + 0 + plugins/UserSettings/images/browsers/CH.gif + 6 @@ -12,18 +24,6 @@ 0 plugins/UserSettings/images/browsers/IE.gif - - - 5 - 5 - 1 - 0 - 5 - 5 - 5 - 0 - plugins/UserSettings/images/browsers/CH.gif - 5 @@ -84,4 +84,16 @@ 0 plugins/UserSettings/images/browsers/UNK.gif + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 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 446d719865..9232fa9e36 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -33,6 +33,17 @@ 5 0 + + + 3 + 3 + 1 + 0 + 3 + 3 + 3 + 0 + 2 @@ -67,7 +78,7 @@ 0 - + 1 1 1 @@ -78,7 +89,7 @@ 0 - + 1 1 1 @@ -89,7 +100,7 @@ 0 - + 1 1 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 fc37ec8a8f..49ec41496f 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 @@ - 27 - 30 + 30 + 33 3 305 - 25 - 25 - 27 + 28 + 28 + 30 0 \ 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 1f8c578db7..d00f93cf7f 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 @@ - 27 - 30 + 30 + 33 3 305 - 25 - 25 - 27 + 28 + 28 + 30 0 \ 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 0a059a62d6..783076988c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,39 +2,39 @@ - 23 - 26 + 25 + 28 3 305 - 21 - 22 - 23 + 23 + 24 + 25 0 plugins/DevicesDetection/images/screens/normal.gif - - 2 - 2 + + 3 + 3 1 0 - 2 - 1 - 2 + 3 + 3 + 3 0 - plugins/DevicesDetection/images/screens/unknown.gif + plugins/DevicesDetection/images/screens/smartphone.png - + 2 2 1 0 2 - 2 + 1 2 0 - plugins/DevicesDetection/images/screens/smartphone.png + plugins/DevicesDetection/images/screens/unknown.gif 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 62d091d83d..540b36d936 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -12,6 +12,18 @@ 0 plugins/UserSettings/images/os/LIN.gif + + + 8 + 11 + 3 + 305 + 6 + 7 + 8 + 0 + plugins/UserSettings/images/os/MAC.gif + 9 @@ -24,27 +36,15 @@ 0 plugins/UserSettings/images/os/WI7.gif - - - 6 - 9 - 3 - 305 - 4 - 5 - 6 - 0 - plugins/UserSettings/images/os/MAC.gif - - 2 - 2 + 3 + 3 1 0 - 2 - 2 - 2 + 3 + 3 + 3 0 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 7cad47e0a1..e9ef7d5e25 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -48,6 +48,18 @@ 0 plugins/UserSettings/images/os/AND.gif + + + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + plugins/UserSettings/images/os/MAC.gif + 2 @@ -60,6 +72,18 @@ 0 plugins/UserSettings/images/os/WXP.gif + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + plugins/UserSettings/images/os/AND.gif + 1 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 d1f2bda02f..a96d5feb81 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -3,43 +3,43 @@ 2 - 10% + 8% plugins/UserSettings/images/plugins/cookie.gif 2 - 10% + 8% plugins/UserSettings/images/plugins/flash.gif 2 - 10% + 8% plugins/UserSettings/images/plugins/java.gif 1 - 5% + 4% plugins/UserSettings/images/plugins/director.gif 1 - 5% + 4% plugins/UserSettings/images/plugins/gears.gif 1 - 5% + 4% plugins/UserSettings/images/plugins/pdf.gif 1 - 5% + 4% plugins/UserSettings/images/plugins/windowsmedia.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 659d5beea1..e59c5a160a 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 @@ - 25 - 28 + 28 + 31 3 305 - 23 - 23 - 25 + 26 + 26 + 28 0 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 1a729a8e26..5135ceaa11 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -12,13 +12,13 @@ - 2 - 2 - 2 + 5 + 5 + 5 0 0 - 2 - 2 + 5 + 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 427319a89f..c20a34497c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -189,13 +189,13 @@ - 3 - 3 + 6 + 6 1 0 - 3 - 2 - 3 + 6 + 5 + 6 0 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 515e54eb3b..7e4e54213f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -243,23 +243,23 @@ - 3 - 3 + 6 + 6 1 0 - 3 + 6 0 - 3 + 6 0 - 2 - 2 - 10 + 5 + 5 + 25 - 2 - 10 + 5 + 25 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 c47de22fc4..6f887b9935 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 @@ - 26 + 29 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 c7ed81d100..80b54d1042 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 @@ - 30 + 33 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 0830ca0d10..cb3e8985be 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 @@ - 27 + 30 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 d7672ae30c..bc773ab9f4 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,8 +2,8 @@ - 33 - 83% + 36 + 84% @@ -18,7 +18,7 @@ 1 - 3% + 2% @@ -33,7 +33,7 @@ 1 - 3% + 2% @@ -58,7 +58,7 @@ 1 - 3% + 2% 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 4e6a9ab29e..c74b0bb7c6 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 @@ - 25 + 28 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 11e27426c0..a3860bf722 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 @@ - 34 + 37 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 a64c14a967..e7620aff16 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 @@ - 25 + 28 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 a0cba6d294..c95a6c1698 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 @@ - 35 + 38 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 3fb9469667..95aa700980 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 @@ -30 \ No newline at end of file +33 \ 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 4c77f1f6e6..ed30e7d83c 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 @@ -25 \ No newline at end of file +28 \ 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 40bd2e592a..3fb9469667 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 @@ -27 \ No newline at end of file +30 \ 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 4c77f1f6e6..ed30e7d83c 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 @@ -25 \ No newline at end of file +28 \ 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 40bd2e592a..3fb9469667 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 @@ -27 \ No newline at end of file +30 \ 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 327d564f47..21695253cd 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 @@ - 27 + 30 0 - 27 - 30 - 25 - 25 + 30 + 33 + 28 + 28 305 3 93% 1.1 - 11 + 10 \ 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 0fb183d46f..2c5c48e71f 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 @@ - 27 - 30 - 26 - 125 - 25 + 30 + 33 + 29 + 140 + 28 100% 100% 100% @@ -42,11 +42,11 @@ 10 5 1 - -96.3% - -66.7% - -61.5% - -96% - -96% + -96.7% + -69.7% + -65.5% + -96.4% + -96.4% http://piwik.net 1 diff --git a/tests/resources/access-logs/fake_logs_custom_iis.log b/tests/resources/access-logs/fake_logs_custom_iis.log new file mode 100644 index 0000000000..73797b64dd --- /dev/null +++ b/tests/resources/access-logs/fake_logs_custom_iis.log @@ -0,0 +1,7 @@ +#Software: IIS Advanced Logging Module +#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.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 -- cgit v1.2.3 From fe24bcc58633f65203275b79c911422913fab609 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Sun, 7 Dec 2014 21:58:59 -0800 Subject: Refs #4707, add test for netscaler logs, support already present due to last commit. --- misc/log-analytics/import_logs.py | 4 +- tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | 19 +++- tests/PHPUnit/System/ImportLogsTest.php | 3 +- ...mportLogs__Actions.getEntryPageTitles_month.xml | 33 ++++++ ...mportLogs__Actions.getEntryPageTitles_range.xml | 37 +++++++ ..._ImportLogs__Actions.getEntryPageUrls_month.xml | 80 ++++++++++++++ ..._ImportLogs__Actions.getEntryPageUrls_range.xml | 84 +++++++++++++++ ...ImportLogs__Actions.getExitPageTitles_month.xml | 33 ++++++ ...ImportLogs__Actions.getExitPageTitles_range.xml | 37 +++++++ ...t_ImportLogs__Actions.getExitPageUrls_month.xml | 77 +++++++++++++ ...t_ImportLogs__Actions.getExitPageUrls_range.xml | 81 ++++++++++++++ ...est_ImportLogs__Actions.getPageTitles_month.xml | 39 ++++++- ...est_ImportLogs__Actions.getPageTitles_range.xml | 43 +++++++- .../test_ImportLogs__Actions.getPageUrls_month.xml | 93 ++++++++++++++++ .../test_ImportLogs__Actions.getPageUrls_range.xml | 97 +++++++++++++++++ .../test_ImportLogs__Actions.get_month.xml | 4 +- .../test_ImportLogs__Actions.get_range.xml | 4 +- ...s__CustomVariables.getCustomVariables_month.xml | 14 ++- ...ImportLogs__DevicesDetection.getBrand_month.xml | 10 +- ...s__DevicesDetection.getBrowserEngines_month.xml | 12 +-- ...__DevicesDetection.getBrowserFamilies_month.xml | 12 +-- ...__DevicesDetection.getBrowserVersions_month.xml | 12 +++ ...ortLogs__DevicesDetection.getBrowsers_month.xml | 12 +-- ...ImportLogs__DevicesDetection.getModel_month.xml | 10 +- ...tLogs__DevicesDetection.getOsFamilies_month.xml | 12 +-- ...tLogs__DevicesDetection.getOsVersions_month.xml | 12 +++ ..._ImportLogs__DevicesDetection.getType_month.xml | 10 +- ...ImportLogs__Goals.getDaysToConversion_month.xml | 2 +- ...tLogs__Goals.getVisitsUntilConversion_month.xml | 2 +- .../expected/test_ImportLogs__Goals.get_month.xml | 8 +- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 119 +++++++++++++++++++++ .../test_ImportLogs__MultiSites.getAll_month.xml | 8 +- .../test_ImportLogs__MultiSites.getOne_month.xml | 8 +- ...test_ImportLogs__Provider.getProvider_month.xml | 10 +- ...ImportLogs__Referrers.getReferrerType_month.xml | 18 ++-- .../test_ImportLogs__UserCountry.getCity_month.xml | 18 ++-- ..._ImportLogs__UserCountry.getContinent_month.xml | 20 ++-- ...st_ImportLogs__UserCountry.getCountry_month.xml | 20 ++-- ...est_ImportLogs__UserCountry.getRegion_month.xml | 18 ++-- ...portLogs__UserSettings.getBrowserType_month.xml | 12 +-- ...tLogs__UserSettings.getBrowserVersion_month.xml | 12 +++ ...t_ImportLogs__UserSettings.getBrowser_month.xml | 12 +-- ...rtLogs__UserSettings.getConfiguration_month.xml | 11 ++ ...ortLogs__UserSettings.getLanguageCode_month.xml | 10 +- ..._ImportLogs__UserSettings.getLanguage_month.xml | 10 +- ...Logs__UserSettings.getMobileVsDesktop_month.xml | 10 +- ..._ImportLogs__UserSettings.getOSFamily_month.xml | 12 +-- .../test_ImportLogs__UserSettings.getOS_month.xml | 12 +++ ...mportLogs__UserSettings.getResolution_month.xml | 10 +- ..._ImportLogs__VisitTime.getByDayOfWeek_month.xml | 10 +- ...tTime.getVisitInformationPerLocalTime_month.xml | 12 +-- ...Time.getVisitInformationPerServerTime_month.xml | 19 +++- ...rest.getNumberOfVisitsByDaysSinceLast_month.xml | 2 +- ...rest.getNumberOfVisitsByDaysSinceLast_range.xml | 2 +- ...nterest.getNumberOfVisitsByVisitCount_month.xml | 2 +- ...nterest.getNumberOfVisitsByVisitCount_range.xml | 2 +- ...itorInterest.getNumberOfVisitsPerPage_month.xml | 2 +- ...itorInterest.getNumberOfVisitsPerPage_range.xml | 2 +- ...est.getNumberOfVisitsPerVisitDuration_month.xml | 2 +- ...est.getNumberOfVisitsPerVisitDuration_range.xml | 2 +- ..._ImportLogs__VisitsSummary.getActions_month.xml | 2 +- ...isitsSummary.getSumVisitsLengthPretty_month.xml | 2 +- ...ogs__VisitsSummary.getSumVisitsLength_month.xml | 2 +- ...Logs__VisitsSummary.getUniqueVisitors_month.xml | 2 +- ...ogs__VisitsSummary.getVisitsConverted_month.xml | 2 +- ...t_ImportLogs__VisitsSummary.getVisits_month.xml | 2 +- .../test_ImportLogs__VisitsSummary.get_month.xml | 14 +-- ...thEnhancedAndLast7__MultiSites.getAll_month.xml | 20 ++-- .../resources/access-logs/fake_logs_netscaler.log | 6 ++ 69 files changed, 1147 insertions(+), 208 deletions(-) create mode 100644 tests/resources/access-logs/fake_logs_netscaler.log diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 8d5afccc17..7b51d2e282 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -191,11 +191,11 @@ class IisFormat(RegexFormat): fields = { 'date': '(?P^\d+[-\d+]+', - 'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together + 'time': '[\d+:]+)[.\d]*?', # TODO should not assume date & time will be together not sure how to fix ATM. 'cs-uri-stem': '(?P/\S*)', 'cs-uri-query': '(?P\S*)', 'c-ip': '"?(?P[\d*.]*)"?', - 'cs(User-Agent)': '(?P".*?"|\S+)', # TODO: must remove quotes if found. also benchmark regex. + 'cs(User-Agent)': '(?P".*?"|\S+)', # TODO: also benchmark regex. 'cs(Referer)': '(?P\S+)', 'sc-status': '(?P\d+)', 'sc-bytes': '(?P\S+)', diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 326eded8b4..1249a57334 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -28,6 +28,7 @@ class ManySitesImportedLogs extends Fixture public $addSegments = false; public $includeIisWithCustom = false; + public $includeNetscaler = false; public static function createAccessInstance() { @@ -116,6 +117,10 @@ class ManySitesImportedLogs extends Fixture if ($this->includeIisWithCustom) { $this->logIisWithCustomFormat(); } + + if ($this->includeNetscaler) { + $this->logNetscaler(); + } } private function setupSegments() @@ -243,7 +248,19 @@ class ManySitesImportedLogs extends Fixture '--token-auth' => self::getTokenAuth(), '--iis-map-field' => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host'), '--enable-http-errors' => false, - '--enable-http-redirects' => false,); + '--enable-http-redirects' => false); + + self::executeLogImporter($logFile, $opts); + } + + private function logNetscaler() + { + $logFile = PIWIK_INCLUDE_PATH . '/tests/resources/access-logs/fake_logs_netscaler.log'; + + $opts = array('--idsite' => $this->idSite, + '--token-auth' => self::getTokenAuth(), + '--iis-map-field' => array(), + '--enable-http-redirects' => false); self::executeLogImporter($logFile, $opts); } diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index ae98fff219..b13317b68f 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -103,4 +103,5 @@ class ImportLogsTest extends SystemTestCase } ImportLogsTest::$fixture = new ManySitesImportedLogs(); -ImportLogsTest::$fixture->includeIisWithCustom = true; \ No newline at end of file +ImportLogsTest::$fixture->includeIisWithCustom = true; +ImportLogsTest::$fixture->includeNetscaler = true; \ No newline at end of file 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 6bddc34c80..020761177c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -98,6 +98,39 @@ + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 240 + 0% + 100% + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 1 + 1 + 240 + 0% + 100% + + + 1 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 34ede98abf..760d1e36f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -148,6 +148,43 @@ 100% 0.145 + + + 1 + 1 + 240 + 0 + + 0 + 1 + 2 + 242 + 0 + 1 + 240 + 0% + 100% + 0 + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 1 + 1 + 240 + 0% + 100% + + + 1 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 571104d49e..422bfa8942 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -388,6 +388,86 @@ 100% http://piwik.net/ + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 240 + 0% + 0% + http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp + + + + + + + + + 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 276835546d..0f3aa66b95 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -646,6 +646,90 @@ + + + 2 + 2 + 240 + 0 + + 0 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + 0 + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 240 + 0% + 0% + http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp + + + + + + + + + 2 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 359024222a..a58e9b42ed 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -83,6 +83,39 @@ + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 240 + 0% + 100% + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 1 + 1 + 240 + 0% + 100% + + + 1 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 e92f88170b..682edbd2ba 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -133,6 +133,43 @@ 100% 0.145 + + + 1 + 1 + 240 + 0 + + 0 + 1 + 2 + 242 + 0 + 1 + 240 + 0% + 100% + 0 + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 1 + 1 + 240 + 0% + 100% + + + 1 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 73eb0a4e7b..47a40e19e2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -388,6 +388,83 @@ 100% http://piwik.net/ + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 0% + 100% + http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp + + + + + + + + + 1 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 9c72bb4a22..ce178ffc4b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -646,6 +646,87 @@ + + + 2 + 2 + 240 + 0 + + 0 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + 0 + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 0% + 100% + http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp + + + + + + + + + 2 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 c2d09b9558..590338f7e9 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 @@ - 21 - 21 + 22 + 22 0 - 21 + 22 0 0% 0% @@ -108,6 +108,39 @@ + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 240 + 0% + 100% + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 1 + 1 + 240 + 0% + 100% + + + 1 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 748064246b..57201f6135 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 @@ - 22 - 31 + 23 + 32 0 10 0.023 1.324 - 22 + 23 0 0% 0% @@ -162,6 +162,43 @@ 100% 0.145 + + + 1 + 1 + 240 + 0 + + 0 + 1 + 2 + 242 + 0 + 1 + 240 + 0% + 100% + 0 + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 1 + 1 + 240 + 0% + 100% + + + 1 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 8a94ddc971..f06bc16d8e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -388,6 +388,99 @@ 100% http://piwik.net/ + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 240 + 0% + 0% + http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp + + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 0% + 100% + http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp + + + + + + + + + 1 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 1331341d0e..7f92f111a8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -646,6 +646,103 @@ + + + 2 + 2 + 240 + 0 + + 0 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + 0 + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 2 + 2 + 240 + 1 + 2 + 242 + 0 + 1 + 120 + 0% + 50% + + + + 1 + 1 + 240 + 1 + 2 + 242 + 0 + 1 + 1 + 240 + 0% + 0% + http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp + + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 0% + 100% + http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp + + + + + + + + + 2 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 8ea3b42ae1..b3451748fd 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 @@ - 29 - 29 + 31 + 31 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 d6fa032f4d..b1758df9dd 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 @@ - 53 - 47 + 55 + 49 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 5deb55d67b..22d47b36a9 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 @@ - 32 + 34 - 24 - 26 - 24 + 25 + 27 + 25 @@ -22,6 +22,12 @@ 2 2 + + + 1 + 1 + 1 + 1 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 2fa0bdd6a2..5c617d6f7b 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 @@ - 27 - 30 + 28 + 32 3 - 305 + 547 25 - 25 - 27 + 26 + 28 0 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 327a80e10d..e633e41334 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -13,13 +13,13 @@ - 6 - 6 - 1 - 0 + 7 + 8 + 2 + 242 6 - 6 - 6 + 7 + 7 0 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 11bca766d0..bb10be5333 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -14,13 +14,13 @@ - 6 - 6 - 1 - 0 + 7 + 8 + 2 + 242 6 - 6 - 6 + 7 + 7 0 plugins/UserSettings/images/browsers/IE.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 e87b26d95f..9e0f3a5f5d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -156,4 +156,16 @@ 0 plugins/UserSettings/images/browsers/IE.gif + + + 1 + 2 + 2 + 242 + 0 + 1 + 1 + 0 + plugins/UserSettings/images/browsers/IE.gif + \ No newline at end of file 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 11bca766d0..bb10be5333 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -14,13 +14,13 @@ - 6 - 6 - 1 - 0 + 7 + 8 + 2 + 242 6 - 6 - 6 + 7 + 7 0 plugins/UserSettings/images/browsers/IE.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 caab5513f5..0f2787c966 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 @@ - 27 - 30 + 28 + 32 3 - 305 + 547 25 - 25 - 27 + 26 + 28 0 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 540b36d936..ce61cb8132 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -26,13 +26,13 @@ - 9 - 9 - 1 - 0 + 10 + 11 + 2 + 242 9 - 9 - 9 + 10 + 10 0 plugins/UserSettings/images/os/WI7.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 e9ef7d5e25..4b74318cfa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -120,4 +120,16 @@ 0 plugins/UserSettings/images/os/UNK.gif + + + 1 + 2 + 2 + 242 + 0 + 1 + 1 + 0 + plugins/UserSettings/images/os/WIN.gif + \ No newline at end of file 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 783076988c..3dea432561 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,13 +2,13 @@ - 25 - 28 + 26 + 30 3 - 305 + 547 23 - 24 - 25 + 25 + 26 0 plugins/DevicesDetection/images/screens/normal.gif 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 485a73a99d..8c1697b221 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 @@ - 27 + 28 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 d1e9091dc3..970c5a295d 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 @@ - 28 + 29 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 6a201ece3a..35d78ccc17 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 @@ - 28 - 28 - 140 - 93.33% + 29 + 29 + 145 + 93.55% \ 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 7b38717520..597edb27da 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,125 @@ + + + 1 + 45 + 172.20.1.0 + + + + action + http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp + 302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp + 61 + + 61 + + + HTTP-code + 302 + + + 240 + 4 min 0s + + + + goal + all + 1 + 5 + 61 + + http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp + plugins/Morpheus/images/goal.png + + + action + http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp + + 62 + + 62 + + + HTTP-code + 200 + + + + + + 1 + USD + $ + + + + + 0 + 2 + + new + + 1 + plugins/Morpheus/images/goal.png + 1 + + none + + 0 + 0 + 242 + 4 min 2s + + + Desktop + Windows + WIN + plugins/UserSettings/images/os/WIN.gif + Trident + Trident (IE) + Internet Explorer 8.0 + Internet Explorer + plugins/UserSettings/images/browsers/IE.gif + IE + 8.0 + 0 + Unknown + Unknown + + direct + Direct Entry + + + + + + + Unknown + unk + Unknown + xx + plugins/UserCountry/images/flags/xx.png + + + + Unknown + + + unknown + + + 11:55:13 + 11 + 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 a28ca5d931..e8065d52ef 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 @@ - 30 - 33 - 29 - 140 + 31 + 35 + 31 + 145 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 23fff27538..ee1db378e4 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 @@ - 30 - 33 + 31 + 35 100% 100% 100% 100% - 29 - 140 + 31 + 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 7b9d3fe496..a640dc2c7d 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 @@ - 30 - 33 + 31 + 35 3 - 305 + 547 28 - 28 - 30 + 29 + 31 0 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 32aa8bed30..833b95476d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,21 +2,21 @@ - 28 - 31 + 29 + 33 3 - 305 + 547 26 - 26 - 26 - 130 + 27 + 27 + 135 - 26 - 130 - 28 + 27 + 135 + 29 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 78d72bc110..8ecf743d81 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,21 +2,21 @@ - 25 - 28 + 26 + 30 3 - 305 + 547 23 - 23 - 23 - 115 + 24 + 24 + 120 - 23 - 115 - 25 + 24 + 120 + 26 0 Unknown 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 0e38b2873c..74286f55c2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -42,21 +42,21 @@ - 7 - 7 - 1 - 0 + 8 + 9 + 2 + 242 7 - 7 - 7 - 35 + 8 + 8 + 40 - 7 - 35 - 7 + 8 + 40 + 8 0 Unknown 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 a0f51627f5..16b270d486 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -48,21 +48,21 @@ - 7 - 7 - 1 - 0 + 8 + 9 + 2 + 242 7 - 7 - 7 - 35 + 8 + 8 + 40 - 7 - 35 - 7 + 8 + 40 + 8 0 xx plugins/UserCountry/images/flags/xx.png 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 f9c0be1893..46e7ebb0cf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,21 +2,21 @@ - 25 - 28 + 26 + 30 3 - 305 + 547 23 - 23 - 23 - 115 + 24 + 24 + 120 - 23 - 115 - 25 + 24 + 120 + 26 0 xx xx 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 327a80e10d..e633e41334 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -13,13 +13,13 @@ - 6 - 6 - 1 - 0 + 7 + 8 + 2 + 242 6 - 6 - 6 + 7 + 7 0 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 e87b26d95f..9e0f3a5f5d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -156,4 +156,16 @@ 0 plugins/UserSettings/images/browsers/IE.gif + + + 1 + 2 + 2 + 242 + 0 + 1 + 1 + 0 + plugins/UserSettings/images/browsers/IE.gif + \ No newline at end of file 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 11bca766d0..bb10be5333 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -14,13 +14,13 @@ - 6 - 6 - 1 - 0 + 7 + 8 + 2 + 242 6 - 6 - 6 + 7 + 7 0 plugins/UserSettings/images/browsers/IE.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 9232fa9e36..dc61e1f5f9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -121,6 +121,17 @@ 1 0 + + + 1 + 2 + 2 + 242 + 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 49ec41496f..ece488d72f 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 @@ - 30 - 33 + 31 + 35 3 - 305 + 547 28 - 28 - 30 + 29 + 31 0 \ 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 d00f93cf7f..084ab04d62 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 @@ - 30 - 33 + 31 + 35 3 - 305 + 547 28 - 28 - 30 + 29 + 31 0 \ 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 783076988c..3dea432561 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,13 +2,13 @@ - 25 - 28 + 26 + 30 3 - 305 + 547 23 - 24 - 25 + 25 + 26 0 plugins/DevicesDetection/images/screens/normal.gif 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 540b36d936..ce61cb8132 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -26,13 +26,13 @@ - 9 - 9 - 1 - 0 + 10 + 11 + 2 + 242 9 - 9 - 9 + 10 + 10 0 plugins/UserSettings/images/os/WI7.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 e9ef7d5e25..4b74318cfa 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -120,4 +120,16 @@ 0 plugins/UserSettings/images/os/UNK.gif + + + 1 + 2 + 2 + 242 + 0 + 1 + 1 + 0 + plugins/UserSettings/images/os/WIN.gif + \ No newline at end of file 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 e59c5a160a..b6ac74ebfb 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 @@ - 28 - 31 + 29 + 33 3 - 305 + 547 26 - 26 - 28 + 27 + 29 0 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 5135ceaa11..a9ba6ca6cc 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 @@ - 9 - 9 - 9 + 10 + 10 + 11 0 - 0 + 242 9 - 9 + 10 4 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 c20a34497c..c87485d5b2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -123,13 +123,13 @@ - 0 - 0 - 0 - 0 + 1 + 2 + 2 + 242 0 - 0 - 0 + 1 + 1 0 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 7e4e54213f..edf1ec12d5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -150,14 +150,23 @@ - 0 - 0 - 0 - 0 + 1 + 2 + 2 + 242 0 0 - 0 + 1 0 + + + 1 + 1 + 5 + + + 1 + 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 6f887b9935..6fbe7c310c 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 + 30 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 80b54d1042..c859e7d5d3 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 + 34 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 cb3e8985be..dcd45b3a61 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 @@ - 30 + 31 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 bc773ab9f4..768a0961d2 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -2,7 +2,7 @@ - 36 + 37 84% 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 c74b0bb7c6..795ab1f55e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -6,7 +6,7 @@ - 1 + 2 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 a3860bf722..6169ecedc1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -6,7 +6,7 @@ - 3 + 4 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 e7620aff16..1f6410e079 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -22,7 +22,7 @@ - 0 + 1 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 c95a6c1698..c53cacde6f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -22,7 +22,7 @@ - 0 + 1 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 95aa700980..8e4b837a62 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 @@ -33 \ No newline at end of file +35 \ 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 0a9c671f55..1df778a05d 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 @@ -5 min 5s \ No newline at end of file +9 min 7s \ 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 df25f1c1f3..38da89c9f0 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 @@ -305 \ No newline at end of file +547 \ 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 3fb9469667..51c650b8b2 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 +31 \ 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 ed30e7d83c..46af1425a3 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 @@ -28 \ No newline at end of file +29 \ 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 3fb9469667..51c650b8b2 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 @@ -30 \ No newline at end of file +31 \ 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 21695253cd..113678e090 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 + 31 0 - 30 - 33 - 28 + 31 + 35 + 29 28 - 305 + 547 3 - 93% + 90% 1.1 - 10 + 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 2c5c48e71f..3f360d1263 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 @@ - 30 - 33 - 29 - 140 - 28 + 31 + 35 + 31 + 145 + 29 100% 100% 100% @@ -42,11 +42,11 @@ 10 5 1 - -96.7% - -69.7% - -65.5% - -96.4% - -96.4% + -96.8% + -71.4% + -67.7% + -96.6% + -96.6% http://piwik.net 1 diff --git a/tests/resources/access-logs/fake_logs_netscaler.log b/tests/resources/access-logs/fake_logs_netscaler.log new file mode 100644 index 0000000000..17035db670 --- /dev/null +++ b/tests/resources/access-logs/fake_logs_netscaler.log @@ -0,0 +1,6 @@ +#Version: 1.0 +#Software: Netscaler Web Logging(NSWL) +#Date: 2014-02-18 11:55:13 +#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer) +2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - - +2012-08-16 11:59:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/silentDetection.jsp - 200 310 5609 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) JSESSIONID=7BBF2F11B80261B27D23010421412323 - \ No newline at end of file -- cgit v1.2.3 From 3d3ec54ae84754a2c17b07a837406921fa10c178 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Sun, 7 Dec 2014 23:27:24 -0800 Subject: Refs #5980, parse cs-username variable in IIS logs and use as userid when present and not anonymous. Includes changes to ImportLogsTest. --- misc/log-analytics/import_logs.py | 16 +- misc/log-analytics/tests/tests.py | 3 +- ...mportLogs__Actions.getEntryPageTitles_month.xml | 25 +-- ...mportLogs__Actions.getEntryPageTitles_range.xml | 25 +-- ..._ImportLogs__Actions.getEntryPageUrls_month.xml | 223 ++++++++++--------- ..._ImportLogs__Actions.getEntryPageUrls_range.xml | 235 ++++++++++++--------- ...ImportLogs__Actions.getExitPageTitles_month.xml | 15 +- ...ImportLogs__Actions.getExitPageTitles_range.xml | 15 +- ...t_ImportLogs__Actions.getExitPageUrls_month.xml | 213 ++++++++++--------- ...t_ImportLogs__Actions.getExitPageUrls_range.xml | 225 +++++++++++--------- ...est_ImportLogs__Actions.getPageTitles_month.xml | 21 +- ...est_ImportLogs__Actions.getPageTitles_range.xml | 21 +- .../test_ImportLogs__Actions.getPageUrls_month.xml | 202 +++++++++++------- .../test_ImportLogs__Actions.getPageUrls_range.xml | 210 +++++++++++------- .../test_ImportLogs__Actions.get_month.xml | 4 +- .../test_ImportLogs__Actions.get_range.xml | 4 +- ...s__CustomVariables.getCustomVariables_month.xml | 8 +- ...ImportLogs__DevicesDetection.getBrand_month.xml | 16 +- ...s__DevicesDetection.getBrowserEngines_month.xml | 12 +- ...__DevicesDetection.getBrowserFamilies_month.xml | 16 +- ...__DevicesDetection.getBrowserVersions_month.xml | 46 ++-- ...ortLogs__DevicesDetection.getBrowsers_month.xml | 16 +- ...ImportLogs__DevicesDetection.getModel_month.xml | 16 +- ...tLogs__DevicesDetection.getOsFamilies_month.xml | 16 +- ...tLogs__DevicesDetection.getOsVersions_month.xml | 16 +- ..._ImportLogs__DevicesDetection.getType_month.xml | 16 +- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 107 ++++++---- .../test_ImportLogs__MultiSites.getAll_month.xml | 4 +- .../test_ImportLogs__MultiSites.getOne_month.xml | 4 +- ...test_ImportLogs__Provider.getProvider_month.xml | 10 +- ...ImportLogs__Referrers.getReferrerType_month.xml | 10 +- .../test_ImportLogs__UserCountry.getCity_month.xml | 10 +- ..._ImportLogs__UserCountry.getContinent_month.xml | 12 +- ...st_ImportLogs__UserCountry.getCountry_month.xml | 12 +- ...est_ImportLogs__UserCountry.getRegion_month.xml | 10 +- ...portLogs__UserSettings.getBrowserType_month.xml | 12 +- ...tLogs__UserSettings.getBrowserVersion_month.xml | 46 ++-- ...t_ImportLogs__UserSettings.getBrowser_month.xml | 16 +- ...rtLogs__UserSettings.getConfiguration_month.xml | 16 +- ...ortLogs__UserSettings.getLanguageCode_month.xml | 10 +- ..._ImportLogs__UserSettings.getLanguage_month.xml | 10 +- ...Logs__UserSettings.getMobileVsDesktop_month.xml | 16 +- ..._ImportLogs__UserSettings.getOSFamily_month.xml | 16 +- .../test_ImportLogs__UserSettings.getOS_month.xml | 16 +- ...mportLogs__UserSettings.getResolution_month.xml | 10 +- .../test_ImportLogs__VisitFrequency.get_month.xml | 16 +- .../test_ImportLogs__VisitFrequency.get_range.xml | 14 +- ..._ImportLogs__VisitTime.getByDayOfWeek_month.xml | 10 +- ...tTime.getVisitInformationPerLocalTime_month.xml | 12 +- ...Time.getVisitInformationPerServerTime_month.xml | 12 +- ...rest.getNumberOfVisitsByDaysSinceLast_month.xml | 4 +- ...rest.getNumberOfVisitsByDaysSinceLast_range.xml | 4 +- ...itorInterest.getNumberOfVisitsPerPage_month.xml | 4 +- ...itorInterest.getNumberOfVisitsPerPage_range.xml | 4 +- ..._ImportLogs__VisitsSummary.getActions_month.xml | 2 +- ...ortLogs__VisitsSummary.getBounceCount_month.xml | 2 +- ...isitsSummary.getSumVisitsLengthPretty_month.xml | 2 +- ...ogs__VisitsSummary.getSumVisitsLength_month.xml | 2 +- ...Logs__VisitsSummary.getUniqueVisitors_month.xml | 2 +- ...st_ImportLogs__VisitsSummary.getUsers_month.xml | 2 +- .../test_ImportLogs__VisitsSummary.get_month.xml | 14 +- ...thEnhancedAndLast7__MultiSites.getAll_month.xml | 8 +- .../resources/access-logs/fake_logs_custom_iis.log | 5 +- 63 files changed, 1129 insertions(+), 972 deletions(-) diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 7b51d2e282..d58f19ba7d 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 @@ class Recorder(object): '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 @@ class Parser(object): # 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 7659afdaff..bf548f4416 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 020761177c..176602a54c 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 760d1e36f0..d2e1425cd7 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 422bfa8942..fa1ff1f005 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 0f3aa66b95..3e13cb2ee3 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 a58e9b42ed..5d27ad0518 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 682edbd2ba..dac53bf5b0 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 47a40e19e2..5e98c56115 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 ce178ffc4b..0922ac138f 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 590338f7e9..201498137f 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 57201f6135..72c06ff0d9 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 f06bc16d8e..fd9e8bda03 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 7f92f111a8..cd8e4c402b 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 b3451748fd..5324c5b44b 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 b1758df9dd..d57d00aeaa 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 22d47b36a9..491523012e 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 5c617d6f7b..34fadbbd57 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 e633e41334..147f52ac7c 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 bb10be5333..aa77898c8a 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 9e0f3a5f5d..ae018d6af0 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 bb10be5333..aa77898c8a 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 0f2787c966..d0be913ad2 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 ce61cb8132..2425b6fcd8 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 4b74318cfa..4a7630b457 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 3dea432561..e838256d3f 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 597edb27da..dbe8ad476d 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 e8065d52ef..d2edd33b60 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 ee1db378e4..79b56ff979 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 a640dc2c7d..f83cd0a71c 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 833b95476d..9b5ba79691 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 8ecf743d81..dc702824f1 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 74286f55c2..212e81c785 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 16b270d486..1c82333bf0 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 46e7ebb0cf..1149b705a7 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 e633e41334..147f52ac7c 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 9e0f3a5f5d..ae018d6af0 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 bb10be5333..aa77898c8a 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 dc61e1f5f9..75d278b51b 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 ece488d72f..8d4b8d074e 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 084ab04d62..3ed6ff7309 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 3dea432561..e838256d3f 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 ce61cb8132..2425b6fcd8 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 4b74318cfa..4a7630b457 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 b6ac74ebfb..378996fabc 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 3633fe5914..02a0dc7272 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 f301254690..c42125d072 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 a9ba6ca6cc..4de7a18047 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 c87485d5b2..dc841363a5 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 edf1ec12d5..144d6c4221 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 6fbe7c310c..005a1842ab 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 c859e7d5d3..a66c195749 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 795ab1f55e..c00b8e2c50 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 6169ecedc1..95adfb7f9a 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 8e4b837a62..8af80c337f 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 ed30e7d83c..40bd2e592a 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 1df778a05d..e686bbc101 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 38da89c9f0..9674a59b3a 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 51c650b8b2..3fb9469667 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 f5722c2b94..13002b2017 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 113678e090..1772684d5e 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 3f360d1263..bce2027e1c 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 73797b64dd..d7ff476a6c 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 -- cgit v1.2.3 From a216ebc3682a0ffc046bb460793b68013acb4cfd Mon Sep 17 00:00:00 2001 From: diosmosis Date: Mon, 8 Dec 2014 18:38:04 -0800 Subject: Add netscaler logs to python tests for log importer. --- misc/log-analytics/tests/logs/netscaler.log | 5 ++++ misc/log-analytics/tests/tests.py | 37 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 misc/log-analytics/tests/logs/netscaler.log diff --git a/misc/log-analytics/tests/logs/netscaler.log b/misc/log-analytics/tests/logs/netscaler.log new file mode 100644 index 0000000000..0eb5d310b3 --- /dev/null +++ b/misc/log-analytics/tests/logs/netscaler.log @@ -0,0 +1,5 @@ +#Version: 1.0 +#Software: Netscaler Web Logging(NSWL) +#Date: 2014-02-18 11:55:13 +#Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer) +2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - - diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index bf548f4416..5cde40d34e 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -369,3 +369,40 @@ def test_iis_custom_format(): assert hits[2]['is_robot'] == False assert hits[2]['full_path'] == u'/hello/world/6,681965' assert hits[2]['user_agent'] == u'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' + +def test_netscaler_parsing(): + """test parsing of netscaler logs (which are similar to IIS logs)""" + + file_ = 'logs/netscaler.log' + + # have to override previous globals override for this test + import_logs.config.options.custom_iis_fields = {} + Recorder.recorders = [] + import_logs.parser = import_logs.Parser() + import_logs.config.format = None + 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.parser.parse(file_) + + hits = [hit.__dict__ for hit in Recorder.recorders] + + assert hits[0]['status'] == u'302' + assert hits[0]['userid'] == None + assert hits[0]['is_error'] == False + assert hits[0]['extension'] == u'jsp' + assert hits[0]['is_download'] == False + assert hits[0]['referrer'] == '' + assert hits[0]['args'] == {} + assert hits[0]['generation_time_milli'] == 0 + assert hits[0]['host'] == 'foo' + assert hits[0]['filename'] == 'logs/netscaler.log' + assert hits[0]['is_redirect'] == True + assert hits[0]['date'] == datetime.datetime(2012, 8, 16, 11, 55, 13) + assert hits[0]['lineno'] == 4 + assert hits[0]['ip'] == u'172.20.1.0' + assert hits[0]['query_string'] == '' + assert hits[0]['path'] == u'/Citrix/XenApp/Wan/auth/login.jsp' + assert hits[0]['is_robot'] == False + assert hits[0]['full_path'] == u'/Citrix/XenApp/Wan/auth/login.jsp' + assert hits[0]['user_agent'] == u'Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022)' \ No newline at end of file -- cgit v1.2.3 From 103c893fdbfc71ee9a9e4dbc4c90ee0d24c36249 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Mon, 8 Dec 2014 19:44:43 -0800 Subject: Refs #6388, map IIS time-taken field to gneration time in log importer. --- misc/log-analytics/import_logs.py | 32 +++++-- misc/log-analytics/tests/logs/netscaler.log | 2 +- misc/log-analytics/tests/tests.py | 13 ++- tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | 7 +- ...mportLogs__Actions.getEntryPageTitles_month.xml | 32 +++++++ ...mportLogs__Actions.getEntryPageTitles_range.xml | 16 +++- ..._ImportLogs__Actions.getEntryPageUrls_month.xml | 96 +++++++++++++++++++ ..._ImportLogs__Actions.getEntryPageUrls_range.xml | 44 +++++++-- ...ImportLogs__Actions.getExitPageTitles_month.xml | 36 +++++++ ...ImportLogs__Actions.getExitPageTitles_range.xml | 16 +++- ...t_ImportLogs__Actions.getExitPageUrls_month.xml | 92 ++++++++++++++++++ ...t_ImportLogs__Actions.getExitPageUrls_range.xml | 32 ++++++- ...est_ImportLogs__Actions.getPageTitles_month.xml | 40 ++++++++ ...est_ImportLogs__Actions.getPageTitles_range.xml | 20 ++-- .../test_ImportLogs__Actions.getPageUrls_month.xml | 104 +++++++++++++++++++++ .../test_ImportLogs__Actions.getPageUrls_range.xml | 44 +++++++-- .../test_ImportLogs__Actions.get_month.xml | 1 + .../test_ImportLogs__Actions.get_range.xml | 2 +- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 3 + 19 files changed, 581 insertions(+), 51 deletions(-) diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index d58f19ba7d..5929f3caa1 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -200,22 +200,20 @@ class IisFormat(RegexFormat): 'sc-status': '(?P\d+)', 'sc-bytes': '(?P\S+)', 'cs-host': '(?P\S+)', - 'cs-username': '(?P\S+)' + 'cs-username': '(?P\S+)', + 'time-taken': '(?P\d+)' } def __init__(self): super(IisFormat, self).__init__('iis', None, '%Y-%m-%d %H:%M:%S') def check_format(self, file): - line = file.readline() - if not line.startswith('#'): + header_lines = [file.readline() for i in xrange(3)] + + if not header_lines[0].startswith('#'): file.seek(0) return - # Skip the next 2 lines. - for i in xrange(2): - file.readline() - # Parse the 4th 'Fields: ' line to create the regex to use full_regex = [] line = file.readline() @@ -225,6 +223,16 @@ class IisFormat(RegexFormat): expected_fields[mapped_field_name] = IisFormat.fields[field_name] del expected_fields[field_name] + # if the --iis-time-taken-secs option is used, make sure the time-taken field is interpreted as seconds + if config.options.iis_time_taken_in_secs: + expected_fields['time-taken'] = '(?P\S+)' + else: + # check if we're importing netscaler logs and if so, issue a warning + if 'netscaler' in header_lines[1].lower(): + logging.info("WARNING: netscaler log file being parsed without --iis-time-taken-secs option. Netscaler" + " stores second values in the time-taken field. If your logfile does this, the aforementioned" + " option must be used in order to get accurate generation times.") + # Skip the 'Fields: ' prefix. line = line[9:] for field in line.split(): @@ -501,6 +509,11 @@ class Configuration(object): "files such as those from the Advanced Logging IIS module. Used as, eg, --iis-map-field my-date=date. " "Recognized default fields include: %s" % (', '.join(IisFormat.fields.keys())) ) + option_parser.add_option( + '--iis-time-taken-secs', action='store_true', default=False, dest='iis_time_taken_in_secs', + help="If set, interprets the time-taken IIS log field as a number of seconds. This must be set for importing" + " netscaler logs." + ) return option_parser def _set_iis_field_map(self, option, opt_str, value, parser): @@ -1686,7 +1699,10 @@ class Parser(object): try: hit.generation_time_milli = int(format.get('generation_time_micro')) / 1000 except BaseFormatException: - hit.generation_time_milli = 0 + try: + hit.generation_time_milli = int(format.get('generation_time_secs')) * 1000 + except BaseFormatException: + hit.generation_time_milli = 0 if config.options.log_hostname: hit.host = config.options.log_hostname diff --git a/misc/log-analytics/tests/logs/netscaler.log b/misc/log-analytics/tests/logs/netscaler.log index 0eb5d310b3..380c09d2c4 100644 --- a/misc/log-analytics/tests/logs/netscaler.log +++ b/misc/log-analytics/tests/logs/netscaler.log @@ -2,4 +2,4 @@ #Software: Netscaler Web Logging(NSWL) #Date: 2014-02-18 11:55:13 #Fields: date time c-ip cs-username sc-servicename s-ip s-port cs-method cs-uri-stem cs-uri-query sc-status cs-bytes sc-bytes time-taken cs-version cs(User-Agent) cs(Cookie) cs(Referer) -2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 0 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - - +2012-08-16 11:55:13 172.20.1.0 - HTTP 192.168.6.254 8080 GET /Citrix/XenApp/Wan/auth/login.jsp - 302 247 355 1 HTTP/1.1 Mozilla/4.0+(compatible;+MSIE+7.0;+Windows+NT+5.1;+Trident/4.0;+.NET+CLR+1.1.4322;+.NET+CLR+2.0.50727;+.NET+CLR+3.0.04506.648;+.NET+CLR+3.5.21022) - - diff --git a/misc/log-analytics/tests/tests.py b/misc/log-analytics/tests/tests.py index 5cde40d34e..89c28dfe4f 100644 --- a/misc/log-analytics/tests/tests.py +++ b/misc/log-analytics/tests/tests.py @@ -68,6 +68,7 @@ class Options(object): enable_http_errors = False download_extensions = 'doc,pdf' custom_iis_fields = {} + iis_time_taken_in_secs = False class Config(object): """Mock configuration.""" @@ -232,7 +233,7 @@ def check_iis_groups(groups): assert groups['host'] == 'example.com' expected_hit_properties = ['date', 'path', 'query_string', 'ip', 'referrer', 'user_agent', - 'status', 'length', 'host', 'userid'] + 'status', 'length', 'host', 'userid', 'generation_time_milli'] for property_name in groups.keys(): assert property_name in expected_hit_properties @@ -301,7 +302,8 @@ def test_iis_custom_format(): import_logs.config.options.custom_iis_fields = { 'date-local': 'date', 'time-local': 'time', - 'cs(Host)': 'cs-host' + 'cs(Host)': 'cs-host', + 'TimeTakenMS': 'time-taken' } Recorder.recorders = [] import_logs.parser = import_logs.Parser() @@ -319,7 +321,7 @@ def test_iis_custom_format(): assert hits[0]['is_download'] == False assert hits[0]['referrer'] == u'"http://example.com/Search/SearchResults.pg?informationRecipient.languageCode.c=en"' assert hits[0]['args'] == {} - assert hits[0]['generation_time_milli'] == 0 + assert hits[0]['generation_time_milli'] == 109 assert hits[0]['host'] == 'foo' assert hits[0]['filename'] == 'logs/iis_custom.log' assert hits[0]['is_redirect'] == False @@ -357,7 +359,7 @@ def test_iis_custom_format(): assert hits[2]['is_download'] == False assert hits[2]['referrer'] == '' assert hits[2]['args'] == {} - assert hits[2]['generation_time_milli'] == 0 + assert hits[2]['generation_time_milli'] == 359 assert hits[2]['host'] == 'foo' assert hits[2]['filename'] == 'logs/iis_custom.log' assert hits[2]['is_redirect'] == False @@ -383,6 +385,7 @@ def test_netscaler_parsing(): 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.iis_time_taken_in_secs = True import_logs.parser.parse(file_) hits = [hit.__dict__ for hit in Recorder.recorders] @@ -394,7 +397,7 @@ def test_netscaler_parsing(): assert hits[0]['is_download'] == False assert hits[0]['referrer'] == '' assert hits[0]['args'] == {} - assert hits[0]['generation_time_milli'] == 0 + assert hits[0]['generation_time_milli'] == 1000 assert hits[0]['host'] == 'foo' assert hits[0]['filename'] == 'logs/netscaler.log' assert hits[0]['is_redirect'] == True diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 1249a57334..365527e280 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -246,7 +246,7 @@ class ManySitesImportedLogs extends Fixture $opts = array('--idsite' => $this->idSite, '--token-auth' => self::getTokenAuth(), - '--iis-map-field' => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host'), + '--iis-map-field' => array('date-local=date', 'time-local=time', 'cs(Host)=cs-host', 'TimeTakenMS=time-taken'), '--enable-http-errors' => false, '--enable-http-redirects' => false); @@ -262,6 +262,9 @@ class ManySitesImportedLogs extends Fixture '--iis-map-field' => array(), '--enable-http-redirects' => false); - self::executeLogImporter($logFile, $opts); + $output = self::executeLogImporter($logFile, $opts); + + // make sure warning about --iis-time-taken-secs appears in importer output + self::assertContains("WARNING: netscaler log file being parsed without --iis-time-taken-secs option.", implode("\n", $output)); } } \ No newline at end of file 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 176602a54c..b979b765d8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -5,6 +5,9 @@ 2 2 180 + 0 + + 0 1 2 182 @@ -13,6 +16,7 @@ 90 0% 50% + 0 @@ -36,6 +40,9 @@ 2 2 0 + 1 + 0.359 + 0.359 2 2 0 @@ -44,12 +51,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -61,12 +72,16 @@ 0 100% 100% + 0.359 1 1 0 + 0 + + 1 1 0 @@ -78,6 +93,7 @@ 0 100% 100% + 0 @@ -86,6 +102,9 @@ 1 1 240 + 0 + + 0 1 2 242 @@ -94,6 +113,7 @@ 240 0% 100% + 0 @@ -119,6 +139,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -127,6 +150,7 @@ 0 100% 100% + 0 @@ -152,6 +176,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -163,12 +190,16 @@ 0 100% 100% + 0 1 1 0 + 0 + + 1 1 0 @@ -180,5 +211,6 @@ 0 100% 100% + 0 \ No newline at end of file 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 d2e1425cd7..81d66a066b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -61,9 +61,9 @@ 2 2 0 - 0 - - 0 + 1 + 0.359 + 0.359 2 2 0 @@ -72,13 +72,16 @@ 0 100% 100% - 0 + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -90,12 +93,16 @@ 0 100% 100% + 0.359 1 1 0 + 0 + + 1 1 0 @@ -107,6 +114,7 @@ 0 100% 100% + 0 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 fa1ff1f005..6ae99318f0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -5,6 +5,9 @@ 5 5 0 + 0 + + 0 5 5 0 @@ -13,6 +16,7 @@ 0 100% 100% + 0 @@ -171,6 +175,9 @@ 4 4 0 + 0 + + 0 4 4 0 @@ -179,6 +186,7 @@ 0 100% 100% + 0 @@ -273,6 +281,9 @@ 4 4 0 + 0 + + 0 4 4 0 @@ -281,6 +292,7 @@ 0 100% 100% + 0 @@ -375,6 +387,9 @@ 2 2 0 + 0 + + 0 2 2 0 @@ -386,6 +401,7 @@ 0 100% 100% + 0 http://piwik.net/ @@ -393,6 +409,9 @@ 2 2 240 + 0 + + 0 1 2 242 @@ -401,6 +420,7 @@ 120 0% 50% + 0 @@ -473,6 +493,9 @@ 2 2 0 + 2 + 0.359 + 0.359 2 2 1 @@ -481,12 +504,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -495,12 +522,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -509,12 +540,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -523,12 +558,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -540,6 +579,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/from/another/world/6,681965 @@ -553,6 +593,9 @@ 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -561,12 +604,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -578,6 +625,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/world/6,681965 @@ -589,6 +637,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -600,6 +651,7 @@ 0 100% 100% + 0 http://example.org/index.htm @@ -607,6 +659,9 @@ 1 1 180 + 0 + + 1 2 182 @@ -616,6 +671,7 @@ 180 0% 0% + 0 http://piwik.net/moved-permanently @@ -623,6 +679,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -634,6 +693,7 @@ 0 100% 100% + 0 http://forum.piwik.org/register.php?0,approve=9a94a02145599 @@ -641,6 +701,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -652,6 +715,7 @@ 0 100% 100% + 0 http://piwik.net/to-an-error @@ -659,6 +723,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -667,6 +734,7 @@ 0 100% 100% + 0 @@ -709,6 +777,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -717,6 +788,7 @@ 0 100% 100% + 0 @@ -743,6 +815,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -751,6 +826,7 @@ 0 100% 100% + 0 @@ -777,6 +853,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -785,6 +864,7 @@ 0 100% 100% + 0 @@ -811,6 +891,9 @@ 1 1 0 + 1 + 0.109 + 0.109 1 2 2 @@ -818,12 +901,16 @@ 0 0% 0% + 0.109 1 1 0 + 1 + 0.109 + 0.109 1 2 2 @@ -833,6 +920,7 @@ 0 0% 0% + 0.109 http://piwik.net/Products/theProduct @@ -842,6 +930,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -850,6 +941,7 @@ 0 100% 100% + 0 @@ -1004,6 +1096,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -1012,6 +1107,7 @@ 0 100% 100% + 0 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 3e13cb2ee3..cce26eeec7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -789,9 +789,9 @@ 2 2 0 - 0 - - 0 + 2 + 0.359 + 0.359 2 2 1 @@ -800,13 +800,16 @@ 0 100% 100% - 0 + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -815,12 +818,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -829,12 +836,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -843,12 +854,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -860,6 +875,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/from/another/world/6,681965 @@ -873,6 +889,9 @@ 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -881,12 +900,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -898,6 +921,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/world/6,681965 @@ -1208,9 +1232,9 @@ 1 1 0 - 0 - - 0 + 1 + 0.109 + 0.109 1 2 2 @@ -1218,13 +1242,16 @@ 0 0% 0% - 0 + 0.109 1 1 0 + 1 + 0.109 + 0.109 1 2 2 @@ -1234,6 +1261,7 @@ 0 0% 0% + 0.109 http://piwik.net/Products/theProduct 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 5d27ad0518..8789133564 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -5,6 +5,9 @@ 2 2 180 + 0 + + 0 1 2 182 @@ -13,6 +16,7 @@ 90 0% 50% + 0 @@ -33,6 +37,9 @@ 2 2 0 + 1 + 0.359 + 0.359 2 2 0 @@ -41,12 +48,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -58,12 +69,16 @@ 0 100% 100% + 0.359 1 1 0 + 0 + + 1 1 0 @@ -75,6 +90,7 @@ 0 100% 100% + 0 @@ -83,6 +99,9 @@ 1 1 240 + 0 + + 0 1 2 242 @@ -91,6 +110,7 @@ 240 0% 100% + 0 @@ -116,10 +136,14 @@ 1 1 0 + 0 + + 0 1 0 0% 100% + 0 @@ -140,6 +164,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -148,6 +175,7 @@ 0 100% 100% + 0 @@ -173,6 +201,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -184,12 +215,16 @@ 0 100% 100% + 0 1 1 0 + 0 + + 1 1 0 @@ -201,5 +236,6 @@ 0 100% 100% + 0 \ No newline at end of file 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 dac53bf5b0..401a36b835 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -58,9 +58,9 @@ 2 2 0 - 0 - - 0 + 1 + 0.359 + 0.359 2 2 0 @@ -69,13 +69,16 @@ 0 100% 100% - 0 + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -87,12 +90,16 @@ 0 100% 100% + 0.359 1 1 0 + 0 + + 1 1 0 @@ -104,6 +111,7 @@ 0 100% 100% + 0 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 5e98c56115..f3ebc92964 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -5,6 +5,9 @@ 5 5 0 + 0 + + 0 5 5 0 @@ -13,6 +16,7 @@ 0 100% 100% + 0 @@ -171,6 +175,9 @@ 4 4 0 + 0 + + 0 4 4 0 @@ -179,6 +186,7 @@ 0 100% 100% + 0 @@ -273,6 +281,9 @@ 4 4 0 + 0 + + 0 4 4 0 @@ -281,6 +292,7 @@ 0 100% 100% + 0 @@ -375,6 +387,9 @@ 2 2 0 + 0 + + 0 2 2 0 @@ -386,6 +401,7 @@ 0 100% 100% + 0 http://piwik.net/ @@ -393,6 +409,9 @@ 2 2 240 + 0 + + 0 1 2 242 @@ -401,6 +420,7 @@ 120 0% 50% + 0 @@ -470,6 +490,9 @@ 2 2 0 + 2 + 0.359 + 0.359 2 2 1 @@ -478,12 +501,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -492,12 +519,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -506,12 +537,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -520,12 +555,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -537,6 +576,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/from/another/world/6,681965 @@ -550,6 +590,9 @@ 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -558,12 +601,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -575,6 +622,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/world/6,681965 @@ -586,6 +634,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -597,6 +648,7 @@ 0 100% 100% + 0 http://example.org/index.htm @@ -604,6 +656,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -615,6 +670,7 @@ 0 100% 100% + 0 http://forum.piwik.org/register.php?0,approve=9a94a02145599 @@ -622,12 +678,16 @@ 1 1 0 + 0 + + 1 1 1 0 0% 100% + 0 http://piwik.net/temp-redirect @@ -635,6 +695,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -646,6 +709,7 @@ 0 100% 100% + 0 http://piwik.net/to-an-error @@ -653,6 +717,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -661,6 +728,7 @@ 0 100% 100% + 0 @@ -703,6 +771,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -711,6 +782,7 @@ 0 100% 100% + 0 @@ -737,6 +809,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -745,6 +820,7 @@ 0 100% 100% + 0 @@ -771,6 +847,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -779,6 +858,7 @@ 0 100% 100% + 0 @@ -805,6 +885,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -813,6 +896,7 @@ 0 100% 100% + 0 @@ -967,10 +1051,14 @@ 1 1 0 + 0 + + 0 1 0 0% 100% + 0 @@ -992,6 +1080,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -1000,6 +1091,7 @@ 0 100% 100% + 0 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 0922ac138f..63c3d594e0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -786,9 +786,9 @@ 2 2 0 - 0 - - 0 + 2 + 0.359 + 0.359 2 2 1 @@ -797,13 +797,16 @@ 0 100% 100% - 0 + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -812,12 +815,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -826,12 +833,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -840,12 +851,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -857,6 +872,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/from/another/world/6,681965 @@ -870,6 +886,9 @@ 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -878,12 +897,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -895,6 +918,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/world/6,681965 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 201498137f..7ecefada55 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -5,16 +5,23 @@ 23 23 0 + 2 + 0.109 + 0.359 23 0 0% 0% + 0.234 2 2 180 + 0 + + 0 1 2 182 @@ -23,6 +30,7 @@ 90 0% 50% + 0 @@ -58,6 +66,9 @@ 2 2 0 + 1 + 0.359 + 0.359 2 2 0 @@ -66,12 +77,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -83,12 +98,16 @@ 0 100% 100% + 0.359 1 1 0 + 0 + + 1 1 0 @@ -100,6 +119,7 @@ 0 100% 100% + 0 @@ -108,6 +128,9 @@ 1 1 240 + 0 + + 0 1 2 242 @@ -116,6 +139,7 @@ 240 0% 100% + 0 @@ -141,10 +165,14 @@ 1 1 0 + 0 + + 0 1 0 0% 100% + 0 @@ -165,6 +193,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -173,6 +204,7 @@ 0 100% 100% + 0 @@ -198,6 +230,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -209,12 +244,16 @@ 0 100% 100% + 0 1 1 0 + 0 + + 1 1 0 @@ -226,5 +265,6 @@ 0 100% 100% + 0 \ No newline at end of file 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 72c06ff0d9..690c2e28a0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -5,14 +5,14 @@ 24 33 0 - 10 + 12 0.023 1.324 24 0 0% 0% - 0.387 + 0.361 @@ -87,9 +87,9 @@ 2 2 0 - 0 - - 0 + 1 + 0.359 + 0.359 2 2 0 @@ -98,13 +98,16 @@ 0 100% 100% - 0 + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -116,12 +119,16 @@ 0 100% 100% + 0.359 1 1 0 + 0 + + 1 1 0 @@ -133,6 +140,7 @@ 0 100% 100% + 0 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 fd9e8bda03..c7ae80a454 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -5,6 +5,9 @@ 5 5 0 + 0 + + 0 5 5 0 @@ -13,6 +16,7 @@ 0 100% 100% + 0 @@ -171,6 +175,9 @@ 4 4 0 + 0 + + 0 4 4 0 @@ -179,6 +186,7 @@ 0 100% 100% + 0 @@ -273,6 +281,9 @@ 4 4 0 + 0 + + 0 4 4 0 @@ -281,6 +292,7 @@ 0 100% 100% + 0 @@ -375,6 +387,9 @@ 2 2 0 + 0 + + 0 2 2 0 @@ -386,6 +401,7 @@ 0 100% 100% + 0 http://piwik.net/ @@ -393,6 +409,9 @@ 2 2 240 + 0 + + 0 1 2 242 @@ -401,6 +420,7 @@ 120 0% 50% + 0 @@ -486,6 +506,9 @@ 2 2 0 + 2 + 0.359 + 0.359 2 2 1 @@ -494,12 +517,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -508,12 +535,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -522,12 +553,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -536,12 +571,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -553,6 +592,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/from/another/world/6,681965 @@ -566,6 +606,9 @@ 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -574,12 +617,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -591,6 +638,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/world/6,681965 @@ -602,6 +650,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -613,6 +664,7 @@ 0 100% 100% + 0 http://example.org/index.htm @@ -620,6 +672,9 @@ 1 1 180 + 0 + + 1 2 182 @@ -629,6 +684,7 @@ 180 0% 0% + 0 http://piwik.net/moved-permanently @@ -636,6 +692,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -647,6 +706,7 @@ 0 100% 100% + 0 http://forum.piwik.org/register.php?0,approve=9a94a02145599 @@ -654,12 +714,16 @@ 1 1 0 + 0 + + 1 1 1 0 0% 100% + 0 http://piwik.net/temp-redirect @@ -667,6 +731,9 @@ 1 1 0 + 0 + + 1 1 0 @@ -678,6 +745,7 @@ 0 100% 100% + 0 http://piwik.net/to-an-error @@ -685,6 +753,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -693,6 +764,7 @@ 0 100% 100% + 0 @@ -735,6 +807,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -743,6 +818,7 @@ 0 100% 100% + 0 @@ -769,6 +845,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -777,6 +856,7 @@ 0 100% 100% + 0 @@ -803,6 +883,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -811,6 +894,7 @@ 0 100% 100% + 0 @@ -837,6 +921,9 @@ 1 1 0 + 1 + 0.109 + 0.109 1 2 2 @@ -844,12 +931,16 @@ 0 0% 0% + 0.109 1 1 0 + 1 + 0.109 + 0.109 1 2 2 @@ -859,6 +950,7 @@ 0 0% 0% + 0.109 http://piwik.net/Products/theProduct @@ -868,6 +960,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -876,6 +971,7 @@ 0 100% 100% + 0 @@ -1030,10 +1126,14 @@ 1 1 0 + 0 + + 0 1 0 0% 100% + 0 @@ -1055,6 +1155,9 @@ 1 1 0 + 0 + + 0 1 1 0 @@ -1063,6 +1166,7 @@ 0 100% 100% + 0 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 cd8e4c402b..3434158d1f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -821,9 +821,9 @@ 2 2 0 - 0 - - 0 + 2 + 0.359 + 0.359 2 2 1 @@ -832,13 +832,16 @@ 0 100% 100% - 0 + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -847,12 +850,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -861,12 +868,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -875,12 +886,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 1 @@ -892,6 +907,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/from/another/world/6,681965 @@ -905,6 +921,9 @@ 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -913,12 +932,16 @@ 0 100% 100% + 0.359 1 1 0 + 1 + 0.359 + 0.359 1 1 0 @@ -930,6 +953,7 @@ 0 100% 100% + 0.359 http://piwik.net/hello/world/6,681965 @@ -1286,9 +1310,9 @@ 1 1 0 - 0 - - 0 + 1 + 0.109 + 0.109 1 2 2 @@ -1296,13 +1320,16 @@ 0 0% 0% - 0 + 0.109 1 1 0 + 1 + 0.109 + 0.109 1 2 2 @@ -1312,6 +1339,7 @@ 0 0% 0% + 0.109 http://piwik.net/Products/theProduct 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 5324c5b44b..18b7f289f6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml @@ -8,4 +8,5 @@ 0 0 0 + 0.277 \ 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 d57d00aeaa..0fc359540d 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml @@ -8,5 +8,5 @@ 1 0 0 - 0.301 + 0.298 \ 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 dbe8ad476d..43d6b4eb4e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -1935,6 +1935,7 @@ 200 + 0.36s @@ -2052,6 +2053,7 @@ 200 + 0.11s 0 0s @@ -2156,6 +2158,7 @@ 404 + 0.36s -- cgit v1.2.3