Adjust elasticsearch configuration, refs #108

Author: Seldaek

DependencyInjection/Configuration.php

@@ -73,10 +73,11 @@
  *
  * - elasticsearch:
  *   - elasticsearch:
+ *      - id: optional if host is given
  *      - host: elastic search host name
  *      - [port]: defaults to 9200
- *      - [index]: index name, defaults to monolog
- *      - [index_type]: index_type name, defaults to logs
+ *   - [index]: index name, defaults to monolog
+ *   - [document_type]: document_type, defaults to logs
  *   - [level]: level name or int value, defaults to DEBUG
  *   - [bubble]: bool, defaults to true
  *
@@ -385,19 +386,24 @@ public function getConfigTreeBuilder()
                             ->end() // mongo
                             ->arrayNode('elasticsearch')
                                 ->canBeUnset()
+                                ->beforeNormalization()
+                                    ->ifString()
+                                    ->then(function ($v) { return array('id'=> $v); })
+                                ->end()
                                 ->children()
+                                    ->scalarNode('id')->end()
                                     ->scalarNode('host')->end()
                                     ->scalarNode('port')->defaultValue(9200)->end()
-                                    ->scalarNode('index')->defaultValue('monolog')->end()
-                                    ->scalarNode('index_type')->defaultValue('logs')->end()
                                 ->end()
                                 ->validate()
                                     ->ifTrue(function ($v) {
-                                        return !isset($v['host']);
+                                        return !isset($v['id']) && !isset($v['host']);
                                     })
-                                    ->thenInvalid('What must be set is host.')
+                                    ->thenInvalid('What must be set is either the host or the id.')
                                 ->end()
                             ->end() // elasticsearch
+                            ->scalarNode('index')->defaultValue('monolog')->end() // elasticsearch
+                            ->scalarNode('document_type')->defaultValue('logs')->end() // elasticsearch
                             ->arrayNode('config')
                                 ->canBeUnset()
                                 ->prototype('scalar')->end()

DependencyInjection/MonologExtension.php

@@ -233,34 +233,29 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             break;
 
         case 'elasticsearch':
-            // elastica client new definition
-            $elasticaClient = new Definition('%monolog.elastica.client.class%');
-            $elasticaClient->setArguments(array(
+            if (isset($handler['elasticsearch']['id'])) {
+                $clientId = $handler['elasticsearch']['id'];
+            } else {
+                // elastica client new definition
+                $elasticaClient = new Definition('%monolog.elastica.client.class%');
+                $elasticaClient->setArguments(array(
                     array(
                         'host' => $handler['elasticsearch']['host'],
                         'port' => $handler['elasticsearch']['port']
                     )
-                )
-            );
-            $container->setDefinition('monolog.elastica.client', $elasticaClient);
-
-            // set parameters for monolog.formatter.elastica service check monolog.xml
-            $container->setParameter('monolog.elasticsearch.index', $handler['elasticsearch']['index']);
-            $container->setParameter('monolog.elasticsearch.index_type', $handler['elasticsearch']['index_type']);
+                ));
 
-            // apply tags in case we want to use channels
-            if (!empty($handler['tags'])) {
-                foreach ($handler['tags'] as $tag) {
-                    $definition->addTag($tag);
-                }
+                $clientId = uniqid('monolog.elastica.client.');
+                $elasticaClient->setPublic(false);
+                $container->setDefinition($clientId, $elasticaClient);
             }
 
             // elastica handler definition
             $definition->setArguments(array(
-                new Reference('monolog.elastica.client'),
+                new Reference($clientId),
                 array(
-                    'index' => $handler['elasticsearch']['index'],
-                    'type'  => $handler['elasticsearch']['index_type'],
+                    'index' => $handler['index'],
+                    'type'  => $handler['document_type'],
                 ),
                 $handler['level'],
                 $handler['bubble']

Resources/config/monolog.xml

@@ -70,9 +70,5 @@
         <service id="monolog.formatter.normalizer" class="Monolog\Formatter\NormalizerFormatter" public="false" />
         <service id="monolog.formatter.scalar" class="Monolog\Formatter\ScalarFormatter" public="false" />
         <service id="monolog.formatter.wildfire" class="Monolog\Formatter\WildfireFormatter" public="false" />
-        <service id="monolog.formatter.elastica" class="Monolog\Formatter\ElasticaFormatter" public="false">
-            <argument index="0">%monolog.elasticsearch.index%</argument>
-            <argument index="1">%monolog.elasticsearch.index_type%</argument>
-        </service>
     </services>
 </container>

Resources/config/schema/monolog-1.0.xsd

@@ -21,6 +21,7 @@
             <xsd:element name="channels" type="channels" minOccurs="0" maxOccurs="1" />
             <xsd:element name="publisher" type="publisher" minOccurs="0" maxOccurs="1" />
             <xsd:element name="mongo" type="mongo" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="elasticsearch" type="elasticsearch" minOccurs="0" maxOccurs="1" />
             <xsd:element name="config" type="xsd:anyType" minOccurs="0" maxOccurs="1" />
             <xsd:element name="excluded-404" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="tag" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
@@ -62,6 +63,8 @@
         <xsd:attribute name="use-attachment" type="xsd:boolean" />
         <xsd:attribute name="icon-emoji" type="xsd:string" />
         <xsd:attribute name="file-permission" type="xsd:string" />
+        <xsd:attribute name="index" type="xsd:string" />
+        <xsd:attribute name="document_type" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:simpleType name="level">
@@ -132,10 +135,8 @@
     </xsd:complexType>
 
     <xsd:complexType name="elasticsearch">
+        <xsd:attribute name="id" type="xsd:string" />
         <xsd:attribute name="host" type="xsd:string" />
         <xsd:attribute name="port" type="xsd:integer" />
-        <xsd:attribute name="index" type="xsd:string" />
-        <xsd:attribute name="index_type" type="xsd:string" />
     </xsd:complexType>
-
 </xsd:schema>