Add Caddy json log support

.github/workflows/tests.yml

@@ -0,0 +1,49 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches: [ 4.x-dev ]
+
+permissions:
+  actions: read
+  checks: read
+  contents: read
+  deployments: none
+  issues: read
+  packages: none
+  pull-requests: read
+  repository-projects: none
+  security-events: none
+  statuses: none
+
+jobs:
+  build:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        python-version: [ '3.7', '3.8', '3.9', '3.10' ]
+        operating-system: [ 'ubuntu-latest' ]
+        include:
+          - python-version: 3.5
+            operating-system: ubuntu-20.04
+          - python-version: 3.6
+            operating-system: ubuntu-20.04
+    name: Tests (Python ${{ matrix.python-version }})
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Pytest
+        run: |
+          pip install --upgrade pip
+          pip install pytest
+          python --version ; pip --version ; pytest --version
+        shell: bash
+      - name: Run Tests
+        run: |
+          cd tests
+          ./run_tests.sh
+        shell: bash

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## Version 4.0.0
+
+- Process file globs in a sorted order (#291)
+- Use new performance metric for server generation time (#260)
+- Support for AWS Application and Elastic Load Balancer log formats (#280)
+- Always disable queued tracking when sending requests from log import (#274)
+- added support for Python 3.5 and above (#267)
+- dropped support for Python 2.x (#267)

README.md

@@ -4,17 +4,17 @@ Import your server logs in Matomo with this powerful and easy to use tool.
 
 ## Requirements
 
-* Python 2.6 or 2.7. Python 3.x is not supported.
-* Matomo >= 2.14.0
+* Python 3.5, 3.6, 3.7, 3.8, 3.9, 3.10.
+* Matomo On-Premise >= 4.0.0 or Matomo Cloud. Doesn't work when [Matomo for WordPress](https://wordpress.org/plugins/matomo/) is used.
 
-Build status (master branch) [![Build Status](https://travis-ci.org/matomo-org/matomo-log-analytics.svg?branch=master)](https://travis-ci.org/matomo-org/matomo-log-analytics)
+Build status (main branch) ![PHPUnit](https://github.com/matomo-org/matomo-log-analytics/workflows/Tests/badge.svg?branch=4.x-dev)
 
 ## Supported log formats
 
 
 The script will import all standard web server log files, and some files with non-standard formats. The following log formats are supported:
- * all default log formats for: Nginx, Apache, IIS, Tomcat
- * all log formats commonly used such as: NCSA Common log format, Extended log format, W3C Extended log files, Nginx JSON, OVH
+ * all default log formats for: Nginx, Apache, IIS, Tomcat, Haproxy
+ * all log formats commonly used such as: NCSA Common log format, Extended log format, W3C Extended log files, Nginx JSON, OVH, Gandi virtualhost servers
  * log files of some popular Cloud services: Amazon AWS CloudFront logs, AWS S3 logs, AWS ELB logs.
  * streaming media server log files such as: Icecast
  * log files with and without the virtual host will be imported
@@ -30,7 +30,7 @@ We're looking for contributors! Feel free to submit Pull requests on Github.
 The Log Analytics importer is designed to detect and import into Matomo as many log files as possible. Help us add your log formats!
 
  * Implement your new log format in the import_logs.py file (look for `FORMATS = {` variable where the log formats are defined),
- * Add a new test in [tests/tests.py](https://github.com/matomo-org/matomo-log-analytics/blob/master/tests/tests.py),
+ * Add a new test in [tests/test_main.py](https://github.com/matomo-org/matomo-log-analytics/blob/4.x-dev/tests/test_main.py),
  * Test that the logs are imported successfully as you expected (`tests/run_tests.sh`),
  * Open a Pull Request,
  * Check the test you have added works (the build should be green),
@@ -71,7 +71,7 @@ If you wish to track all requests the following command would be used:
   log importer interprets the field correctly.
 
 * Some log formats can't be detected automatically as they would conflict with other formats. In order to import those logfiles make sure to specify the `--log-format-name` option.
-  Those log formats are: OVH
+  Those log formats are: OVH (ovh), Incapsula W3C (incapsula_w3c)
 
 ## How to import your logs automatically every day?
 
@@ -234,7 +234,7 @@ Just needed to configure the best params for import_logs.py, file `/usr/local/ma
 
 ##### Example of regex for syslog format (centralized logs)
 
-###### log format exemple
+###### log format example
 
 ```
 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