Branch: refs/heads/master Home: https://github.com/jenkinsci/logstash-plugin Commit: c014184142bea52430281576b3a2fdaa26d3d1bb https://github.com/jenkinsci/logstash-plugin/commit/c014184142bea52430281576b3a2fdaa26d3d1bb Author: Markus Winter <m_win...@gmx.de> Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths: M README.md M pom.xml A src/main/java/jenkins/plugins/logstash/LogstashConfiguration.java M src/main/java/jenkins/plugins/logstash/LogstashInstallation.java M src/main/java/jenkins/plugins/logstash/LogstashWriter.java M src/main/java/jenkins/plugins/logstash/PluginImpl.java A src/main/java/jenkins/plugins/logstash/configuration/ElasticSearch.java A src/main/java/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer.java A src/main/java/jenkins/plugins/logstash/configuration/LogstashIndexer.java A src/main/java/jenkins/plugins/logstash/configuration/RabbitMq.java A src/main/java/jenkins/plugins/logstash/configuration/Redis.java A src/main/java/jenkins/plugins/logstash/configuration/Syslog.java M src/main/java/jenkins/plugins/logstash/persistence/AbstractLogstashIndexerDao.java M src/main/java/jenkins/plugins/logstash/persistence/BuildData.java M src/main/java/jenkins/plugins/logstash/persistence/ElasticSearchDao.java A src/main/java/jenkins/plugins/logstash/persistence/HostBasedLogstashIndexerDao.java R src/main/java/jenkins/plugins/logstash/persistence/IndexerDaoFactory.java M src/main/java/jenkins/plugins/logstash/persistence/LogstashIndexerDao.java M src/main/java/jenkins/plugins/logstash/persistence/RabbitMqDao.java M src/main/java/jenkins/plugins/logstash/persistence/RedisDao.java M src/main/java/jenkins/plugins/logstash/persistence/SyslogDao.java A src/main/resources/index.jelly A src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/config.jelly A src/main/resources/jenkins/plugins/logstash/LogstashConfiguration/help-logstashIndexer.html M src/main/resources/jenkins/plugins/logstash/LogstashInstallation/global.jelly R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-host.html R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-key.html R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-password.html R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-port.html R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-syslogFormat.html R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-syslogProtocol.html R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-type.html R src/main/resources/jenkins/plugins/logstash/LogstashInstallation/help-username.html M src/main/resources/jenkins/plugins/logstash/Messages.properties A src/main/resources/jenkins/plugins/logstash/configuration/ElasticSearch/config.jelly A src/main/resources/jenkins/plugins/logstash/configuration/ElasticSearch/help-password.html A src/main/resources/jenkins/plugins/logstash/configuration/ElasticSearch/help-uri.html A src/main/resources/jenkins/plugins/logstash/configuration/ElasticSearch/help-username.html A src/main/resources/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer/config.jelly A src/main/resources/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer/help-host.html A src/main/resources/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexer/help-port.html A src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/configure-advanced.jelly A src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/help-password.html A src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/help-queue.html A src/main/resources/jenkins/plugins/logstash/configuration/RabbitMq/help-username.html A src/main/resources/jenkins/plugins/logstash/configuration/Redis/configure-advanced.jelly A src/main/resources/jenkins/plugins/logstash/configuration/Redis/help-key.html A src/main/resources/jenkins/plugins/logstash/configuration/Redis/help-password.html A src/main/resources/jenkins/plugins/logstash/configuration/Syslog/configure-advanced.jelly A src/main/resources/jenkins/plugins/logstash/configuration/Syslog/help-messageFormat.html A src/main/resources/jenkins/plugins/logstash/configuration/Syslog/help-syslogProtocol.html M src/test/java/jenkins/plugins/logstash/LogstashBuildWrapperTest.java A src/test/java/jenkins/plugins/logstash/LogstashConfigurationMigrationTest.java A src/test/java/jenkins/plugins/logstash/LogstashConfigurationTest.java A src/test/java/jenkins/plugins/logstash/LogstashConfigurationTestBase.java M src/test/java/jenkins/plugins/logstash/LogstashIntegrationTest.java M src/test/java/jenkins/plugins/logstash/LogstashOutputStreamTest.java M src/test/java/jenkins/plugins/logstash/LogstashWriterTest.java A src/test/java/jenkins/plugins/logstash/configuration/ElasticSearchTest.java A src/test/java/jenkins/plugins/logstash/configuration/HostBasedLogstashIndexerTest.java A src/test/java/jenkins/plugins/logstash/configuration/RabbitMqTest.java A src/test/java/jenkins/plugins/logstash/configuration/RedisTest.java A src/test/java/jenkins/plugins/logstash/configuration/SyslogTest.java M src/test/java/jenkins/plugins/logstash/persistence/AbstractLogstashIndexerDaoTest.java M src/test/java/jenkins/plugins/logstash/persistence/ElasticSearchDaoTest.java R src/test/java/jenkins/plugins/logstash/persistence/IndexerDaoFactoryTest.java A src/test/java/jenkins/plugins/logstash/persistence/MemoryDao.java M src/test/java/jenkins/plugins/logstash/persistence/RabbitMqDaoTest.java M src/test/java/jenkins/plugins/logstash/persistence/RedisDaoTest.java M src/test/java/jenkins/plugins/logstash/persistence/SyslogDaoTest.java M src/test/java/jenkins/plugins/logstash/persistence/SyslogDaoTestIT.java A src/test/resources/elasticSearch.xml A src/test/resources/rabbitmq.xml A src/test/resources/redis.xml A src/test/resources/syslog.xml Log Message: ----------- move configuration from ToolInstallation to GlobalConfiguration (#43) * displayname of node in pipeline properly get the node when BuildData is initilaized from a pipeline pump mockito to latest version add integration test, that use Jenkins test harness * refactoring the plugin used a ToolInstallation for configuration. But logstash is not a tool that can be installed. Instead this should be a GlobalConfiguration. The indexers have different configuration requirements. Host and port are common, but things like username are not required everywhere. Also the previous implementation was totally unflexible. In order to add a new indexer one has to modify the sources. By configuring the indexers via an extension point we make it easily possible to have individual configuration jelly for each type. Adding a new indexer is just adding new classes. So it can be even moved to a separate plugin. Many of the fields in the plugin were public or package private. They have been made private or protected with corresponding getters and setters and direct calls to the fields replaced. Get the charset of a run and use it whenever we need to convert the String to a byte array Use DateFormatter from apache common lang to avoid potential threading problems. * jenkins and java use Jenkins 2.7.4 instead of 2.60.3 fix problem with cast that is requried with java 7 * fix findbugs issues in buildData Use FastDateFormat from apache which is thread safe Avoid possible NPE in Node detection Avoid possible NPE in result (previous logic already avoided it but findbugs still claimed it to be a problem) Node detection is same for pipeline and freestyle so move it to initData method * javadoc and readme update javadoc to get more information for developers that want to extend the plugin. Update the readme Use the not deprecated junit runner of mockito * remove unnecessary dependency to workflow-step-api * do the comparison if something has changed in the configuration class * incorporate feedback rename junit test methods synchronize getting the dao instance to avoid problems. deprecate enums * adjust link to plugin page * simplify equals * host based indexers vs uri introduce an abstract host based indexer that serves as base for most indexers. Elastic search uses a uri approach where we need scheme, host, port and url path, so we allow to configure a uri instead. * add some todos * use URL instead of URI stapler is not able to autconvert String to URI add more TODOs * use URI as persistence for elastic search url URI can be easier compared some minor changes in tests * fix test * use ExpectedException rule -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.