jenkins-bot has submitted this change and it was merged.

Change subject: Send logs to Kibana with a parsoid-tests namespace prefix
......................................................................


Send logs to Kibana with a parsoid-tests namespace prefix

* This lets us monitor testing issues without having to trawl
  through disk logs.

Change-Id: Iac1123d798146bf3981b95e0cd6ccf18d6ba48ea
---
M tests/rttest.localsettings.js
1 file changed, 24 insertions(+), 36 deletions(-)

Approvals:
  Arlolra: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/rttest.localsettings.js b/tests/rttest.localsettings.js
index bc7f248..e39f4ec 100644
--- a/tests/rttest.localsettings.js
+++ b/tests/rttest.localsettings.js
@@ -20,51 +20,39 @@
        // Turn on the batching API
        parsoidConfig.useBatchAPI = true;
 
-       // We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly
-       // for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks',
-       // 'enwikivoyage' etc. (default true)
-       //  parsoidConfig.loadWMF = false;
-
-       // A default proxy to connect to the API endpoints. Default: undefined
-       // (no proxying). Overridden by per-wiki proxy config in setMwApi.
-       //  parsoidConfig.defaultAPIProxyURI = 'http://proxy.example.org:8080';
-
-       // Enable debug mode (prints extra debugging messages)
-       //  parsoidConfig.debug = true;
-
-       // Use the PHP preprocessor to expand templates via the MW API (default 
true)
-       //  parsoidConfig.usePHPPreProcessor = false;
-
        // Use selective serialization (default false)
        parsoidConfig.useSelser = true;
-
-       // Allow cross-domain requests to the API (default '*')
-       // Sets Access-Control-Allow-Origin header
-       // disable:
-       //  parsoidConfig.allowCORS = false;
-       // restrict:
-       //  parsoidConfig.allowCORS = 'some.domain.org';
-
-       // Allow override of port/interface:
-       //  parsoidConfig.serverPort = 8000;
-       //  parsoidConfig.serverInterface = '127.0.0.1';
 
        // The URL of your LintBridge API endpoint
        //  parsoidConfig.linterAPI = 'http://lintbridge.wmflabs.org/add';
 
-       // Require SSL certificates to be valid (default true)
-       // Set to false when using self-signed SSL certificates
-       //  parsoidConfig.strictSSL = false;
-
-       // Use a different server for CSS style modules.
-       // Set to true to use bits.wikimedia.org, or to a string with the URI.
-       // Leaving it undefined (the default) will use the same URI as the MW 
API,
-       // changing api.php for load.php.
-       //  parsoidConfig.modulesLoadURI = true;
-
        // Set rtTestMode to true for round-trip testing
        parsoidConfig.rtTestMode = true;
 
+       // Direct logs to logstash via bunyan and gelf-stream.
+       var LOGSTASH_HOSTNAME = 'logstash1003.eqiad.wmnet';
+       var LOGSTASH_PORT = 12201;
+       parsoidConfig.loggerBackend = {
+               name: ':Logger.bunyan/BunyanLogger',
+               options: {
+                       // Replicate log to disk and to Logstash.
+                       // Use a parsoid-tests prefix to distinguish from
+                       // production parsoid logs.
+                       name: 'parsoid-tests',
+                       streams: [
+                               {
+                                       stream: process.stdout,
+                                       level: 'debug',
+                               },
+                               {
+                                       type: 'raw',
+                                       stream: 
require('gelf-stream').forBunyan(LOGSTASH_HOSTNAME, LOGSTASH_PORT),
+                                       level: 'warn',
+                               },
+                       ],
+               },
+       };
+
        // Set to true to enable Performance timing
        parsoidConfig.useDefaultPerformanceTimer = false;
        // Peformance timing options for testing

-- 
To view, visit https://gerrit.wikimedia.org/r/248538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac1123d798146bf3981b95e0cd6ccf18d6ba48ea
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to