diff options
Diffstat (limited to 'misc')
-rwxr-xr-x | misc/composer/build-xhprof.sh | 5 | ||||
-rw-r--r-- | misc/log-analytics/README.md | 14 | ||||
-rw-r--r-- | misc/others/tracker_simpleImageTracker.php | 6 | ||||
-rwxr-xr-x | misc/package/build.sh | 5 | ||||
-rw-r--r-- | misc/proxy-hide-piwik-url/README.md | 6 |
5 files changed, 27 insertions, 9 deletions
diff --git a/misc/composer/build-xhprof.sh b/misc/composer/build-xhprof.sh index 95057dc26e..517d228d0b 100755 --- a/misc/composer/build-xhprof.sh +++ b/misc/composer/build-xhprof.sh @@ -11,6 +11,11 @@ if ! type make &> /dev/null; then exit fi +if ! [ -d "vendor/facebook/xhprof/extension" ]; then + echo "xhprof missing, skipping build" + exit +fi + mkdir -p tmp/xhprof-logs cd vendor/facebook/xhprof/extension diff --git a/misc/log-analytics/README.md b/misc/log-analytics/README.md index 7842da798a..6c4aadf675 100644 --- a/misc/log-analytics/README.md +++ b/misc/log-analytics/README.md @@ -249,5 +249,19 @@ exec python /path/to/misc/log-analytics/import_logs.py \ --log-format-name=nginx_json - ``` +# regex example for syslog format (centralized logs) + +## log format exemple + +``` +Aug 31 23:59:59 tt-srv-name www.tt.com: 1.1.1.1 - - [31/Aug/2014:23:59:59 +0200] "GET /index.php HTTP/1.0" 200 3838 "http://www.tt.com/index.php" "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Firefox/31.0" 365020 www.tt.com +``` + +## Corresponding regex + +``` +--log-format-regex='.* ((?P<ip>\S+) \S+ \S+ \[(?P<date>.*?) (?P<timezone>.*?)\] "\S+ (?P<path>.*?) \S+" (?P<status>\S+) (?P<length>\S+) "(?P<referrer>.*?)" "(?P<user_agent>.*?)").*' +``` + And that's all ! diff --git a/misc/others/tracker_simpleImageTracker.php b/misc/others/tracker_simpleImageTracker.php index 30f6c2b211..6bcaf21fd1 100644 --- a/misc/others/tracker_simpleImageTracker.php +++ b/misc/others/tracker_simpleImageTracker.php @@ -12,11 +12,11 @@ $trackingURL = Piwik_getUrlTrackPageView($idSite = 16, $customTitle = 'This titl <script type="text/javascript"> var _paq = _paq || []; (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://localhost/piwik-master/"; + var u="//localhost/piwik-master/"; _paq.push(["setTrackerUrl", u+"piwik.php"]); _paq.push(["setSiteId", "16"]); - var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript"; - g.defer=true; g.async=true; g.src=u+"js/piwik.js"; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; + g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code --> diff --git a/misc/package/build.sh b/misc/package/build.sh index 7e3a8557bc..09366b1fa4 100755 --- a/misc/package/build.sh +++ b/misc/package/build.sh @@ -36,15 +36,14 @@ function cleanupWorkspace() { # organize files for packaging function organizePackage() { curl -sS https://getcomposer.org/installer | php - php composer.phar install + php composer.phar install --no-dev cd ../ rm -rf piwik/composer.phar rm -rf piwik/vendor/twig/twig/test/ rm -rf piwik/vendor/twig/twig/doc/ rm -rf piwik/vendor/symfony/console/Symfony/Component/Console/Tests rm -rf piwik/vendor/symfony/console/Symfony/Component/Console/Resources/bin - rm -rf piwik/vendor/phpunit/ - rm -rf piwik/vendor/sebastian/ + rm -rf piwik/vendor/piwik/device-detector/Tests/ rm -rf piwik/libs/PhpDocumentor-1.3.2/ rm -rf piwik/libs/FirePHPCore/ diff --git a/misc/proxy-hide-piwik-url/README.md b/misc/proxy-hide-piwik-url/README.md index a5344beda3..8c726b20ac 100644 --- a/misc/proxy-hide-piwik-url/README.md +++ b/misc/proxy-hide-piwik-url/README.md @@ -29,11 +29,11 @@ To run this properly you will need ``` [...] (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://trackedsite.com/"; + var u="//trackedsite.com/"; _paq.push(["setTrackerUrl", u+"piwik.php"]); _paq.push(["setSiteId", "trackedsite-id"]); - var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript"; - g.defer=true; g.async=true; g.src=u+"piwik.php"; s.parentNode.insertBefore(g,s); + var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; + g.type="text/javascript"; g.async=true; g.defer=true; g.src=u+"piwik.php"; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code --> |