Merge pull request #142 from damien-list/master

Allow authentication against protected Elasticsearch server

Author: Seldaek

DependencyInjection/Configuration.php

@@ -412,6 +412,9 @@ public function getConfigTreeBuilder()
                                     ->scalarNode('id')->end()
                                     ->scalarNode('host')->end()
                                     ->scalarNode('port')->defaultValue(9200)->end()
+                                    ->scalarNode('transport')->defaultValue('http')->end()
+                                    ->scalarNode('user')->defaultNull()->end()
+                                    ->scalarNode('password')->defaultNull()->end()
                                 ->end()
                                 ->validate()
                                     ->ifTrue(function ($v) {

DependencyInjection/MonologExtension.php

@@ -236,11 +236,25 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             } else {
                 // elastica client new definition
                 $elasticaClient = new Definition('%monolog.elastica.client.class%');
+                $elasticaClientArguments = array(
+                    'host' => $handler['elasticsearch']['host'],
+                    'port' => $handler['elasticsearch']['port'],
+                    'transport' => $handler['elasticsearch']['transport'],
+                );
+
+                if (isset($handler['elasticsearch']['user']) && isset($handler['elasticsearch']['password'])) {
+                    $elasticaClientArguments = array_merge(
+                        $elasticaClientArguments,
+                        array(
+                            'headers' => array(
+                                'Authorization ' =>  'Basic ' . base64_encode($handler['elasticsearch']['user'] . ':' . $handler['elasticsearch']['password'])
+                            )
+                        )
+                    );
+                }
+
                 $elasticaClient->setArguments(array(
-                    array(
-                        'host' => $handler['elasticsearch']['host'],
-                        'port' => $handler['elasticsearch']['port'],
-                    ),
+                    $elasticaClientArguments
                 ));
 
                 $clientId = uniqid('monolog.elastica.client.');

Resources/config/schema/monolog-1.0.xsd

@@ -144,5 +144,8 @@
         <xsd:attribute name="id" type="xsd:string" />
         <xsd:attribute name="host" type="xsd:string" />
         <xsd:attribute name="port" type="xsd:integer" />
+        <xsd:attribute name="transport" type="xsd:string" />
+        <xsd:attribute name="user" type="xsd:string" />
+        <xsd:attribute name="password" type="xsd:string" />
     </xsd:complexType>
 </xsd:schema>