diff --git a/LICENSE b/LICENSE index 4b67d37d..1b747105 100644 --- a/LICENSE +++ b/LICENSE @@ -21,4 +21,3 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ - diff --git a/README.md b/README.md index c9ff236e..520af243 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Logstash plugin can be used as a publisher in pipeline jobs to send the whole lo It can be used as a wrapper step to send each log line separately. -Note: when you combine with timestamps step, you should make the timestamps the outer most block. Otherwise you get the timestamps as part of the log lines, basically duplicating the timestamp information. +Note: when you combine with timestamps step, you should make the timestamps the outer most block. Otherwise you get the timestamps as part of the log lines, basically duplicating the timestamp information. ```Groovy timestamps { @@ -73,7 +73,7 @@ Contributing Adding support for new indexers ------------------------------- -* Implement the extension point `jenkins.plugins.logstash.configuration.LogstashIndexer` that will take your configuration. +* Implement the extension point `jenkins.plugins.logstash.configuration.LogstashIndexer` that will take your configuration. * Implement `equals()` and `hashCode()`so the plugin can compare new configuration with existing configuration. * Create a `configure-advanced.jelly` for the UI part of your configuration. * Create a `help.jelly` with more details about indexer. diff --git a/src/main/java/jenkins/plugins/logstash/PluginImpl.java b/src/main/java/jenkins/plugins/logstash/PluginImpl.java index f264f385..932a1b2b 100644 --- a/src/main/java/jenkins/plugins/logstash/PluginImpl.java +++ b/src/main/java/jenkins/plugins/logstash/PluginImpl.java @@ -54,4 +54,3 @@ public DescriptorExtensionList, Descriptor return LogstashIndexer.all(); } } - diff --git a/src/main/java/jenkins/plugins/logstash/persistence/ElasticSearchDao.java b/src/main/java/jenkins/plugins/logstash/persistence/ElasticSearchDao.java index 65f4de99..96feb347 100644 --- a/src/main/java/jenkins/plugins/logstash/persistence/ElasticSearchDao.java +++ b/src/main/java/jenkins/plugins/logstash/persistence/ElasticSearchDao.java @@ -143,11 +143,11 @@ public String getKey() { return uri.getPath(); } - + public String getMimeType() { return this.mimeType; } - + public void setMimeType(String mimeType) { this.mimeType = mimeType; } @@ -166,7 +166,7 @@ public void setCustomKeyStore(KeyStore customKeyStore) throws SSLHelper.setClientBuilderSSLContext(this.clientBuilder, customKeyStore); this.customKeyStore = customKeyStore; } - + HttpPost getHttpPost(String data) { HttpPost postRequest = new HttpPost(uri); String mimeType = this.getMimeType(); diff --git a/src/main/java/jenkins/plugins/logstash/persistence/LogstashDao.java b/src/main/java/jenkins/plugins/logstash/persistence/LogstashDao.java index 09c20df4..11580e0f 100644 --- a/src/main/java/jenkins/plugins/logstash/persistence/LogstashDao.java +++ b/src/main/java/jenkins/plugins/logstash/persistence/LogstashDao.java @@ -23,4 +23,4 @@ public void push(String data) throws IOException { out.close(); } } -} \ No newline at end of file +} diff --git a/src/main/java/jenkins/plugins/logstash/persistence/LogstashIndexerDao.java b/src/main/java/jenkins/plugins/logstash/persistence/LogstashIndexerDao.java index 879ae521..ed6293ed 100644 --- a/src/main/java/jenkins/plugins/logstash/persistence/LogstashIndexerDao.java +++ b/src/main/java/jenkins/plugins/logstash/persistence/LogstashIndexerDao.java @@ -46,12 +46,12 @@ enum IndexerType { @Deprecated enum SyslogFormat { - RFC5424, - RFC3164 + RFC5424, + RFC3164 } enum SyslogProtocol { - UDP + UDP } String getDescription(); diff --git a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/config.jelly b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/config.jelly index 1ad826e2..286223bf 100644 --- a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/config.jelly +++ b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/config.jelly @@ -2,15 +2,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enableGlobally.html b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enableGlobally.html index 4034f221..4e21cea3 100644 --- a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enableGlobally.html +++ b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enableGlobally.html @@ -1 +1 @@ -Checking will make all non pipeline builds forward their log to the above indexer. \ No newline at end of file +Checking will make all non pipeline builds forward their log to the above indexer. diff --git a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enabled.html b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enabled.html index 5680ec12..6b2f51e5 100644 --- a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enabled.html +++ b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-enabled.html @@ -1 +1 @@ -By enabling logstash you can send the log output to various indexers like Elastic Search or RabbitMQ (See help of Indexer Type). \ No newline at end of file +By enabling logstash you can send the log output to various indexers like Elastic Search or RabbitMQ (See help of Indexer Type). diff --git a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-logstashIndexer.jelly b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-logstashIndexer.jelly index b62ec47a..f1765dc1 100644 --- a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-logstashIndexer.jelly +++ b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-logstashIndexer.jelly @@ -8,4 +8,4 @@
-

\ No newline at end of file +

diff --git a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-milliSecondTimestamps.html b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-milliSecondTimestamps.html index c6754b8f..e2e99322 100644 --- a/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-milliSecondTimestamps.html +++ b/src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-milliSecondTimestamps.html @@ -1,2 +1,2 @@ -Use time stamps that include the milliseconds of the event. This should ensure that the indexer will keep the order of events when -they arrive in the same second. \ No newline at end of file +Use time stamps that include the milliseconds of the event. This should ensure that the indexer will keep the order of events when +they arrive in the same second. diff --git a/src/main/resources/jenkins/plugins/logstash/LogstashJobProperty/config.jelly b/src/main/resources/jenkins/plugins/logstash/LogstashJobProperty/config.jelly index 00a6dd27..9911957a 100644 --- a/src/main/resources/jenkins/plugins/logstash/LogstashJobProperty/config.jelly +++ b/src/main/resources/jenkins/plugins/logstash/LogstashJobProperty/config.jelly @@ -1,5 +1,5 @@ - - + + diff --git a/src/main/resources/jenkins/plugins/logstash/Messages.properties b/src/main/resources/jenkins/plugins/logstash/Messages.properties index 14956598..318e3bf8 100644 --- a/src/main/resources/jenkins/plugins/logstash/Messages.properties +++ b/src/main/resources/jenkins/plugins/logstash/Messages.properties @@ -1,27 +1,27 @@ -# The MIT License -# -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# -# 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. - -DisplayName = Send console log to Logstash -ValueIsInt = Value must be an integer -ValueIsRequired = Value is required -PleaseProvideHost = Please set a valid host name -ProvideValidMimeType = Please provide a valid mime type \ No newline at end of file +# The MIT License +# +# Copyright 2013 Hewlett-Packard Development Company, L.P. +# +# 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. + +DisplayName = Send console log to Logstash +ValueIsInt = Value must be an integer +ValueIsRequired = Value is required +PleaseProvideHost = Please set a valid host name +ProvideValidMimeType = Please provide a valid mime type diff --git a/src/main/resources/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer/config.jelly b/src/main/resources/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer/config.jelly index d4292310..0411ecc7 100644 --- a/src/main/resources/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer/config.jelly +++ b/src/main/resources/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer/config.jelly @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/configure-advanced.jelly b/src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/configure-advanced.jelly index b01eb7fb..b4135bde 100644 --- a/src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/configure-advanced.jelly +++ b/src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/configure-advanced.jelly @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/jenkins/plugins/logstash/configuration/Redis/configure-advanced.jelly b/src/main/resources/jenkins/plugins/logstash/configuration/Redis/configure-advanced.jelly index 9280df52..019cb016 100644 --- a/src/main/resources/jenkins/plugins/logstash/configuration/Redis/configure-advanced.jelly +++ b/src/main/resources/jenkins/plugins/logstash/configuration/Redis/configure-advanced.jelly @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/jenkins/plugins/logstash/configuration/Syslog/configure-advanced.jelly b/src/main/resources/jenkins/plugins/logstash/configuration/Syslog/configure-advanced.jelly index 57a244a7..b4b48bc4 100644 --- a/src/main/resources/jenkins/plugins/logstash/configuration/Syslog/configure-advanced.jelly +++ b/src/main/resources/jenkins/plugins/logstash/configuration/Syslog/configure-advanced.jelly @@ -6,4 +6,4 @@ ${it.name()} - \ No newline at end of file + diff --git a/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashSendStep/help.html b/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashSendStep/help.html index 7a4ee65c..8be397b0 100644 --- a/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashSendStep/help.html +++ b/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashSendStep/help.html @@ -2,7 +2,7 @@

Send the tail of the log to Logstash.

Hint: In order to get the result in the data sent to Logstash it must be set before the logstashSend step.
- Due to the way log output was collected in older version of the pipeline plugin, the logstashSend step might not + Due to the way log output was collected in older version of the pipeline plugin, the logstashSend step might not transfer the lines logged directly before the step is called. Adding a sleep of 1 second might help here.

diff --git a/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashStep/help.html b/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashStep/help.html index 287857a7..e047e0d3 100644 --- a/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashStep/help.html +++ b/src/main/resources/jenkins/plugins/logstash/pipeline/LogstashStep/help.html @@ -1 +1 @@ -
Send individual log lines to Logstash.
\ No newline at end of file +
Send individual log lines to Logstash.
diff --git a/src/test/resources/buildWrapperConfig.xml b/src/test/resources/buildWrapperConfig.xml index c27838df..d393c58f 100644 --- a/src/test/resources/buildWrapperConfig.xml +++ b/src/test/resources/buildWrapperConfig.xml @@ -14,6 +14,6 @@ - + - \ No newline at end of file + diff --git a/src/test/resources/disabled.xml b/src/test/resources/disabled.xml index e25a1469..7f93a1a7 100644 --- a/src/test/resources/disabled.xml +++ b/src/test/resources/disabled.xml @@ -9,4 +9,4 @@ false true true - \ No newline at end of file + diff --git a/src/test/resources/elasticSearch.xml b/src/test/resources/elasticSearch.xml index 494e0bf0..bdad4950 100644 --- a/src/test/resources/elasticSearch.xml +++ b/src/test/resources/elasticSearch.xml @@ -6,4 +6,4 @@ {AQAAABAAAAAQdB13xsx5UlCScGiBcVUOL0GqWYwAU5syhW9iBb6tG+4=} true - \ No newline at end of file + diff --git a/src/test/resources/home/jobs/test/config.xml b/src/test/resources/home/jobs/test/config.xml index 50f3398d..e55f4e29 100644 --- a/src/test/resources/home/jobs/test/config.xml +++ b/src/test/resources/home/jobs/test/config.xml @@ -13,6 +13,6 @@ - + - \ No newline at end of file + diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker index ca6ee9ce..1f0955d4 100644 --- a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -1 +1 @@ -mock-maker-inline \ No newline at end of file +mock-maker-inline diff --git a/src/test/resources/rabbitmq.xml b/src/test/resources/rabbitmq.xml index ec3572a4..570f7a5a 100644 --- a/src/test/resources/rabbitmq.xml +++ b/src/test/resources/rabbitmq.xml @@ -9,4 +9,4 @@ true true - \ No newline at end of file + diff --git a/src/test/resources/rabbitmq_brokenCharset.xml b/src/test/resources/rabbitmq_brokenCharset.xml index 199a7daf..03b7e17a 100644 --- a/src/test/resources/rabbitmq_brokenCharset.xml +++ b/src/test/resources/rabbitmq_brokenCharset.xml @@ -9,4 +9,4 @@ true true - \ No newline at end of file + diff --git a/src/test/resources/redis.xml b/src/test/resources/redis.xml index a4cff3a5..ee33abee 100644 --- a/src/test/resources/redis.xml +++ b/src/test/resources/redis.xml @@ -7,4 +7,4 @@ {AQAAABAAAAAQAwaAxyveddM0PF+kR0dYFAymdth9PpitQnvJW0SR6JU=} true - \ No newline at end of file + diff --git a/src/test/resources/syslog.xml b/src/test/resources/syslog.xml index 2c6c0dc4..90f951d7 100644 --- a/src/test/resources/syslog.xml +++ b/src/test/resources/syslog.xml @@ -7,4 +7,4 @@ UDP true - \ No newline at end of file +