Skip to content

Allow authentication against protected Elasticsearch server #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 18, 2015
Merged

Allow authentication against protected Elasticsearch server #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68aa0d5
Allow authentication against protected Elasticsearch server.
damien-list Oct 30, 2015
f9cc82e
Add options transport, user and password for Elasticsearch handler.
damien-list Oct 30, 2015
1025c6d
Add options transport, user and password for Elasticsearch handler.
damien-list Oct 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,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) {
Expand Down
22 changes: 18 additions & 4 deletions DependencyInjection/MonologExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
Expand Down
3 changes: 3 additions & 0 deletions Resources/config/schema/monolog-1.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,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>