Merge pull request #1 from markusa380/monolog-loki-exp

markusa380 · web-flow · commit 3faa89d7f892 · 2025-07-02T21:45:06.000+02:00
Monolog Loki Logging
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -4,6 +4,7 @@ services:
     networks:
       - servernet
       - internal
+      - monitor-net
     depends_on:
       - database
     volumes:
@@ -57,6 +58,8 @@ networks:
     driver: overlay
   servernet:
     external: true
+  monitor-net:
+    external: true
 
 secrets:
   # AWS credentials file for a user with s3:PutObject permission
diff --git a/mediawiki/LocalSettings.php b/mediawiki/LocalSettings.php
@@ -1,11 +1,56 @@
 <?php
-# See https://www.mediawiki.org/wiki/Manual:Configuration_settings
+ini_set( 'display_errors', 1 );
+ini_set( 'display_startup_errors', 1 );
+ini_set( 'log_errors', 'On' );
+ini_set( 'error_log', '/dev/stderr' );
+
+error_reporting( -1 );
+# https://www.mediawiki.org/wiki/Manual:Configuration_settings
 
 # Protect against web entry
 if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
+$wgMWLoggerDefaultSpi = [
+    'class' => '\\MediaWiki\\Logger\\MonologSpi',
+    'args' => [ [
+        'loggers' => [
+            '@default' => [
+                'processors' => [ 'wiki', 'psr' ],
+                'handlers' => [ 'loki' ]
+            ],
+            'rdbms' => [],
+            'objectcache' => [],
+            'SQLBagOStuff' => []
+        ],
+        'processors' => [
+            'wiki' => [ 'class' => '\\MediaWiki\\Logger\\Monolog\\WikiProcessor' ],
+            'psr' => [ 'class' => '\\Monolog\\Processor\\PsrLogMessageProcessor' ],
+        ],
+        'handlers' => [
+            'loki' => [
+                'class' => \Itspire\MonologLoki\Handler\LokiHandler::class,
+                'args' => [ [
+                    'entrypoint' => 'http://loki:3100',
+                    'context' => [],
+                    'labels' => [
+                        'app' => 'nv-wiki'
+                    ],
+                    'client_name' => 'nv-wiki',
+                ] ],
+                'formatter' => 'lokif'
+            ],
+        ],
+        'formatters' => [
+            'lokif' => [ 'class' => \Itspire\MonologLoki\Formatter\LokiFormatter::class ]
+        ]
+    ] ]
+];
+
+## Uncomment this to disable output compression
+# $wgDisableOutputCompression = true;
+
 $wgSitename = "Night Vision Wiki";
 $wgMetaNamespace = "Project";
 
@@ -17,7 +62,7 @@
 $wgScriptPath = "";
 
 ## The protocol and server name to use in fully-qualified URLs
-# $wgServer = "http://192.168.0.159:8082";
+# $wgServer = "http://192.168.0.159:8080";
 $wgServer = "https://nv-intl.com";
 
 ## The URL path to static resources (images, scripts, etc.)
diff --git a/mediawiki/composer.local.json b/mediawiki/composer.local.json
@@ -10,7 +10,8 @@
     "x-mediawiki/pluggableauth": "1",
     "x-mediawiki/templatestyles": "2",
     "x-mediawiki/uploadwizard": "2",
-    "x-mediawiki/wsoauth": "1"
+    "x-mediawiki/wsoauth": "1",
+    "itspire/monolog-loki": "1.3.0"
   },
   "repositories": [
     {
