mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-06-28 01:22:26 -04:00
Disable ingest-attachment logging (#93878)
Co-authored-by: Keith Massey <keith.massey@elastic.co>
This commit is contained in:
parent
c63d0afb21
commit
7ae08e2257
9 changed files with 68 additions and 34 deletions
5
docs/changelog/93878.yaml
Normal file
5
docs/changelog/93878.yaml
Normal file
|
@ -0,0 +1,5 @@
|
|||
pr: 93878
|
||||
summary: Disable ingest-attachment logging
|
||||
area: Ingest Node
|
||||
type: bug
|
||||
issues: []
|
|
@ -3484,6 +3484,11 @@
|
|||
<sha256 value="a310bc79c3f4744e2b2e993702fcebaf3696fec0063643ffdc6b49a8fb03ef39" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.slf4j" name="jcl-over-slf4j" version="2.0.6">
|
||||
<artifact name="jcl-over-slf4j-2.0.6.jar">
|
||||
<sha256 value="7aee1e1a12f4e2b3b42af9453a098132339d419056c178105543f23e79633a69" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.slf4j" name="slf4j-api" version="1.7.10">
|
||||
<artifact name="slf4j-api-1.7.10.jar">
|
||||
<sha256 value="3863e27005740d4d1289bf87b113efea115e9a22408a7d623be8004991232bfe" origin="Generated by Gradle"/>
|
||||
|
@ -3529,6 +3534,11 @@
|
|||
<sha256 value="4d41e01c40caf8a6c74add2b073055d8a4ce1c30e58154177b13f12d78abbe7b" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.slf4j" name="slf4j-nop" version="2.0.6">
|
||||
<artifact name="slf4j-nop-2.0.6.jar">
|
||||
<sha256 value="7966dcd73078250f38595223b1e807cd7566188a56236def031e265426056fc8" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.sonatype.sisu.inject" name="cglib" version="2.2.1-v20090111">
|
||||
<artifact name="cglib-2.2.1-v20090111.jar">
|
||||
<sha256 value="42e1dfb26becbf1a633f25b47e39fcc422b85e77e4c0468d9a44f885f5fa0be2" origin="Generated by Gradle"/>
|
||||
|
|
|
@ -24,10 +24,21 @@ def versions = [
|
|||
'mime4j': '0.8.9'
|
||||
]
|
||||
|
||||
// exclude commons-logging from test dependencies to avoid jar-hell, we use jcl-over-slf4j here
|
||||
configurations.testRuntimeClasspath { exclude module: 'commons-logging' }
|
||||
|
||||
dependencies {
|
||||
// logging
|
||||
// take over logging for all dependencies
|
||||
api "org.slf4j:slf4j-api:2.0.6"
|
||||
api "commons-logging:commons-logging:1.2"
|
||||
api "org.slf4j:jcl-over-slf4j:2.0.6"
|
||||
|
||||
// route slf4j over log4j
|
||||
// TODO blocked on https://github.com/elastic/elasticsearch/issues/93714
|
||||
// api "org.apache.logging.log4j:log4j-slf4j2-impl:2.19.0"
|
||||
|
||||
// nop all slf4j logging
|
||||
// workaround for https://github.com/elastic/elasticsearch/issues/93714
|
||||
api "org.slf4j:slf4j-nop:2.0.6"
|
||||
|
||||
// mandatory for tika
|
||||
api "org.apache.tika:tika-core:${versions.tika}"
|
||||
|
@ -88,6 +99,10 @@ tasks.named("dependencyLicenses").configure {
|
|||
mapping from: /tika-langdetect-.*/, to: 'tika-langdetect'
|
||||
}
|
||||
|
||||
esplugin.bundleSpec.from('config/ingest-attachment') {
|
||||
into 'config'
|
||||
}
|
||||
|
||||
tasks.named("forbiddenPatterns").configure {
|
||||
exclude '**/*.doc'
|
||||
exclude '**/*.docx'
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
Apache Commons CLI
|
||||
Copyright 2001-2009 The Apache Software Foundation
|
||||
|
||||
This product includes software developed by
|
||||
The Apache Software Foundation (http://www.apache.org/).
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
@ -175,28 +174,3 @@
|
|||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
24
modules/ingest-attachment/licenses/slf4j-nop-LICENSE.txt
Normal file
24
modules/ingest-attachment/licenses/slf4j-nop-LICENSE.txt
Normal file
|
@ -0,0 +1,24 @@
|
|||
Copyright (c) 2004-2007 QOS.ch
|
||||
All rights reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
|
0
modules/ingest-attachment/licenses/slf4j-nop-NOTICE.txt
Normal file
0
modules/ingest-attachment/licenses/slf4j-nop-NOTICE.txt
Normal file
11
modules/ingest-attachment/src/main/config/log4j2.properties
Normal file
11
modules/ingest-attachment/src/main/config/log4j2.properties
Normal file
|
@ -0,0 +1,11 @@
|
|||
logger.org_apache_pdfbox.name = org.apache.pdfbox
|
||||
logger.org_apache_pdfbox.level = off
|
||||
|
||||
logger.org_apache_poi.name = org.apache.poi
|
||||
logger.org_apache_poi.level = off
|
||||
|
||||
logger.org_apache_fontbox.name = org.apache.fontbox
|
||||
logger.org_apache_fontbox.level = off
|
||||
|
||||
logger.org_apache_xmlbeans.name = org.apache.xmlbeans
|
||||
logger.org_apache_xmlbeans.level = off
|
Loading…
Add table
Add a link
Reference in a new issue