From 967883a12d91e892cac8f835f85ae9a05e7894be Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Mon, 9 Jul 2018 15:31:49 +0200 Subject: [PATCH 01/23] External Logging API Plugin Skeleton --- .gitignore | 15 ++ .mvn/extensions.xml | 7 + .mvn/maven.config | 2 + Jenkinsfile | 1 + external-logging-api/pom.xml | 112 +++++++++++++ .../jenkins/plugins/extlogging/api/Event.java | 38 +++++ .../api/ExternalLoggingEventWriter.java | 34 ++++ .../extlogging/api/ExternalLoggingMethod.java | 71 ++++++++ .../api/SensitiveStringsProvider.java | 38 +++++ .../ExternalLoggingGlobalConfiguration.java | 64 ++++++++ .../impl/ExternalLoggingMethodLocator.java | 24 +++ .../api/impl/ExternalLoggingOutputStream.java | 50 ++++++ ...ggingThroughMasterOutputStreamWrapper.java | 29 ++++ .../MaskSensitiveStringsProvider.java | 67 ++++++++ .../pipeline/ExternalPipelineLogStorage.java | 129 +++++++++++++++ .../ExternalPipelineLogStorageFactory.java | 61 +++++++ .../api/util/AbstractConsoleAction.java | 37 +++++ .../api/util/MaskSecretsOutputStream.java | 152 ++++++++++++++++++ .../extlogging/api/util/UniqueIdHelper.java | 35 ++++ .../src/main/resources/index.jelly | 5 + .../AbstractConsoleAction/buildCaption.jelly | 53 ++++++ pom.xml | 40 +++++ 22 files changed, 1064 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/extensions.xml create mode 100644 .mvn/maven.config create mode 100644 Jenkinsfile create mode 100644 external-logging-api/pom.xml create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java create mode 100644 external-logging-api/src/main/resources/index.jelly create mode 100644 external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0834364 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +target + +# mvn hpi:run +work + +# IntelliJ IDEA project files +*.iml +*.iws +*.ipr +.idea + +# Eclipse project files +.settings +.classpath +.project diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..510f24f --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.0-beta-3 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..2a0299c --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,2 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..5b60d43 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1 @@ +buildPlugin(platforms: ['linux']) diff --git a/external-logging-api/pom.xml b/external-logging-api/pom.xml new file mode 100644 index 0000000..fefa409 --- /dev/null +++ b/external-logging-api/pom.xml @@ -0,0 +1,112 @@ + + + 4.0.0 + + + org.jenkins-ci.plugins + plugin + 3.15 + + + + io.jenkins.plugins.external-logging + external-logging-api + External Logging API plugin + The plugin provides API to simplify external logging implementations for Jenkins + https://wiki.jenkins.io/display/JENKINS/External+Logging+API+Plugin + ${revision}${changelist} + hpi + + + 1.0-alpha-1 + -SNAPSHOT + 2.131-SNAPSHOT + 8 + 2.28-rc337.8abe7c5204d9 + true + + + + + MIT License + https://opensource.org/licenses/MIT + + + + + scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git + scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git + https://github.com/jenkinsci/${project.artifactId}-plugin + ${scmTag} + + + + + org.jenkins-ci.plugins + unique-id + 2.1.1 + + + org.jenkins-ci.plugins + mask-passwords + 2.12.0 + true + + + + org.jenkins-ci.plugins.workflow + workflow-job + 2.22-rc311.5616213fbed0 + + + org.jenkins-ci.plugins.workflow + workflow-support + 2.19-rc265.3e5e4aeecfff + + + org.jenkins-ci.plugins.workflow + workflow-api + 2.29-rc219.239019e84015 + + + + + org.jenkins-ci.plugins.workflow + workflow-durable-task-step + 2.20-rc333.74dc7c303e6d + test + + + org.jenkins-ci.plugins.workflow + workflow-cps + 2.19 + test + + + org.jenkins-ci.plugins.workflow + workflow-basic-steps + 2.2 + test + + + org.jenkins-ci.plugins + credentials-binding + 1.15 + test + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java new file mode 100644 index 0000000..0744259 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java @@ -0,0 +1,38 @@ +package io.jenkins.plugins.extlogging.api; + +import javax.annotation.CheckForNull; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Oleg Nenashev + * @since TODO + */ +public class Event { + + final String message; + final long timestamp; + + Map data = new HashMap<>(); + + public Event(String message) { + this(message, System.currentTimeMillis()); + } + + public Event(String message, long timestamp) { + this.message = message; + this.timestamp = timestamp; + } + + public String getMessage() { + return message; + } + + public long getTimestamp() { + return timestamp; + } + + public Map getData() { + return data; + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java new file mode 100644 index 0000000..5d20caa --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java @@ -0,0 +1,34 @@ +package io.jenkins.plugins.extlogging.api; + +import java.io.IOException; +import java.io.Serializable; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Oleg Nenashev + * @since TODO + */ +public abstract class ExternalLoggingEventWriter extends Writer implements Serializable { + + Map metadata = new HashMap<>(); + + public abstract void writeEvent(Event event) throws IOException; + + public void writeMessage(String message) throws IOException { + Event event = new Event(message); + event.data = metadata; // We do not copy the entry to save performance, custom implementations may need better logic + writeEvent(event); + } + + public void addMetadataEntry(String key, Object value) { + metadata.put(key, value); + } + + @Override + public void write(char[] cbuf, int off, int len) throws IOException { + String message = new String(cbuf, off, len); + writeMessage(message); + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java new file mode 100644 index 0000000..639e250 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java @@ -0,0 +1,71 @@ +package io.jenkins.plugins.extlogging.api; + +import hudson.console.ConsoleLogFilter; +import hudson.model.Run; +import java.io.IOException; +import java.io.OutputStream; +import java.util.List; + +import hudson.model.TaskListener; +import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream; +import io.jenkins.plugins.extlogging.api.impl.LoggingThroughMasterOutputStreamWrapper; +import jenkins.model.logging.LoggingMethod; + +import javax.annotation.CheckForNull; + +/** + * Implements External logging method and simplifies API. + * @author Oleg Nenashev + * @since TODO + */ +public abstract class ExternalLoggingMethod extends LoggingMethod { + + @Override + public ConsoleLogFilter createLoggerDecorator(Run run) { + return new ConsoleLogFilter() { + @Override + public OutputStream decorateLogger(Run run, OutputStream logger) throws IOException, InterruptedException { + return decorateLogger(run, logger); + } + }; + } + + public final OutputStream createOutputStream(Run run) { + final ExternalLoggingEventWriter writer = createWriter(run); + final List sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings(run); + return ExternalLoggingOutputStream.createOutputStream(writer, sensitiveStrings); + } + + /** + * Creates Remotable wrapper. + * By default, logging happens through master unless there is a custom implementation. + * @param run Run + * @return Remotable wrapper + */ + public OutputStreamWrapper createWrapper(Run run) { + //TODO: capture agent in API to allow overrides with checks + return new LoggingThroughMasterOutputStreamWrapper(createOutputStream(run)); + } + + @CheckForNull + @Override + public TaskListener createTaskListener(Run run) { + //TODO: task listener implementation + return null; + } + + public abstract ExternalLoggingEventWriter createWriter(Run run); + + public abstract OutputStream decorateLogger(Run run, OutputStream logger); + + @Override + public OutputStreamWrapper provideOutStream(Run run) { + return createWrapper(run); + } + + @Override + public OutputStreamWrapper provideErrStream(Run run) { + return createWrapper(run); + } + +} \ No newline at end of file diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java new file mode 100644 index 0000000..9de0cfc --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java @@ -0,0 +1,38 @@ +package io.jenkins.plugins.extlogging.api; + +import hudson.ExtensionList; +import hudson.ExtensionPoint; +import hudson.model.Run; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +/** + * Provides a list of sensitive variables, which should be hidden from console. + * @author Oleg Nenashev + * @since TODO + */ +public abstract class SensitiveStringsProvider implements ExtensionPoint { + + public abstract void getSensitiveStrings(@Nonnull Run run, List dest); + + public static List getAllSensitiveStrings(@Nonnull Run run) { + final ExtensionList all = all(); + if (all.isEmpty()) { + return Collections.emptyList(); + } + + ArrayList res = new ArrayList<>(); + for (SensitiveStringsProvider provider : all) { + provider.getSensitiveStrings(run, res); + } + return res; + } + + public static ExtensionList all() { + return ExtensionList.lookup(SensitiveStringsProvider.class); + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java new file mode 100644 index 0000000..c777635 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java @@ -0,0 +1,64 @@ +package io.jenkins.plugins.extlogging.api.impl; + +import hudson.Extension; +import jdk.nashorn.internal.objects.Global; +import jenkins.model.GlobalConfiguration; +import jenkins.model.logging.LogBrowser; +import jenkins.model.logging.LoggingMethod; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +/** + * @author Oleg Nenashev + * @since TODO + */ +@Extension +public class ExternalLoggingGlobalConfiguration extends GlobalConfiguration { + + private static final ExternalLoggingGlobalConfiguration DEFAULT = new DefaultExternalLoggingGlobalConfiguration(); + + @CheckForNull + private LoggingMethod loggingMethod; + + @CheckForNull + private LogBrowser logBrowser; + + @Nonnull + public static ExternalLoggingGlobalConfiguration get() { + ExternalLoggingGlobalConfiguration cfg = GlobalConfiguration.all().get(ExternalLoggingGlobalConfiguration.class); + return cfg != null ? cfg : DEFAULT; + } + + public ExternalLoggingGlobalConfiguration() { + load(); + } + + public void setLogBrowser(@CheckForNull LogBrowser logBrowser) { + this.logBrowser = logBrowser; + this.save(); + } + + public void setLoggingMethod(@CheckForNull LoggingMethod loggingMethod) { + this.loggingMethod = loggingMethod; + this.save(); + } + + @CheckForNull + public LogBrowser getLogBrowser() { + return logBrowser; + } + + @CheckForNull + public LoggingMethod getLoggingMethod() { + return loggingMethod; + } + + private static final class DefaultExternalLoggingGlobalConfiguration extends ExternalLoggingGlobalConfiguration { + + public DefaultExternalLoggingGlobalConfiguration() { + // prevent config loading + } + + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java new file mode 100644 index 0000000..1278707 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java @@ -0,0 +1,24 @@ +package io.jenkins.plugins.extlogging.api.impl; + +import hudson.Extension; +import hudson.model.Run; +import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod; +import jenkins.model.logging.LoggingMethod; +import jenkins.model.logging.LoggingMethodLocator; + +import javax.annotation.CheckForNull; + +/** + * @author Oleg Nenashev + * @since TODO + */ +@Extension +public class ExternalLoggingMethodLocator extends LoggingMethodLocator { + + @CheckForNull + @Override + protected LoggingMethod getLoggingMethod(Run run) { + return ExternalLoggingGlobalConfiguration.get().getLoggingMethod(); + } + +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java new file mode 100644 index 0000000..07f451a --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java @@ -0,0 +1,50 @@ +package io.jenkins.plugins.extlogging.api.impl; + +import hudson.console.LineTransformationOutputStream; +import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter; +import io.jenkins.plugins.extlogging.api.util.MaskSecretsOutputStream; + +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.Collection; +import java.util.Collections; + +/** + * @author Oleg Nenashev + * @since TODO + */ +public class ExternalLoggingOutputStream extends LineTransformationOutputStream { + + ExternalLoggingEventWriter writer; + + public ExternalLoggingOutputStream(ExternalLoggingEventWriter writer) { + this.writer = writer; + } + + @Override protected void eol(byte[] b, int len) throws IOException { + int eol = len; + while (eol > 0) { + byte c = b[eol - 1]; + if (c == '\n' || c == '\r') { + eol--; + } else { + break; + } + } + String message = new String(b, 0, eol, StandardCharsets.UTF_8); + writer.writeMessage(message); + } + + public static OutputStream createOutputStream(ExternalLoggingEventWriter writer, Collection sensitiveStrings) { + if (sensitiveStrings.isEmpty()) { + return new ExternalLoggingOutputStream(writer); + } else { + return new MaskSecretsOutputStream( + new ExternalLoggingOutputStream(writer), + sensitiveStrings, + Collections.emptyList() + ); + } + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java new file mode 100644 index 0000000..703f900 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java @@ -0,0 +1,29 @@ +package io.jenkins.plugins.extlogging.api.impl; + +import hudson.remoting.RemoteOutputStream; +import jenkins.model.logging.LoggingMethod; + +import java.io.OutputStream; + +/** + * @author Oleg Nenashev + * @since TODO + */ +public class LoggingThroughMasterOutputStreamWrapper implements LoggingMethod.OutputStreamWrapper { + + final OutputStream ostream; + + public LoggingThroughMasterOutputStreamWrapper(OutputStream stream) { + this.ostream = stream; + } + + @Override + public OutputStream toRawOutputStream() { + return ostream; + } + + @Override + public OutputStream toSerializableOutputStream() { + return new RemoteOutputStream(ostream); + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java new file mode 100644 index 0000000..4b116a7 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java @@ -0,0 +1,67 @@ +package io.jenkins.plugins.extlogging.api.integrations.MaskPasswordsSensitiveStringsProvider; + +import com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsBuildWrapper; +import com.michelin.cio.hudson.plugins.maskpasswords.MaskPasswordsConfig; +import hudson.Extension; +import hudson.model.BuildableItemWithBuildWrappers; +import hudson.model.Job; +import hudson.model.Run; +import hudson.tasks.BuildWrapper; +import io.jenkins.plugins.extlogging.api.SensitiveStringsProvider; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * @author Oleg Nenashev + * @since TODO + */ +@Extension(optional = true) +public class MaskSensitiveStringsProvider extends SensitiveStringsProvider { + + private static final Logger LOGGER = Logger.getLogger(MaskSensitiveStringsProvider.class.getName()); + + static { + String wrapperName = MaskPasswordsBuildWrapper.class.getName(); + LOGGER.log(Level.FINEST, "Initialized SensitiveStringsProvider for {0}", wrapperName); + } + + @Override + public void getSensitiveStrings(@Nonnull Run run, List dest) { + for (MaskPasswordsBuildWrapper.VarPasswordPair pair : getVarPasswordPairs(run)) { + dest.add(pair.getPassword()); + } + } + + @Restricted(NoExternalUse.class) + public static List getVarPasswordPairs(Run build) { + List allPasswordPairs = new ArrayList<>(); + Job job = build.getParent(); + if (job instanceof BuildableItemWithBuildWrappers) { + BuildableItemWithBuildWrappers project = (BuildableItemWithBuildWrappers) job; + for (BuildWrapper wrapper : project.getBuildWrappersList()) { + if (wrapper instanceof MaskPasswordsBuildWrapper) { + MaskPasswordsBuildWrapper maskPasswordsWrapper = (MaskPasswordsBuildWrapper) wrapper; + List jobPasswordPairs = maskPasswordsWrapper.getVarPasswordPairs(); + if (jobPasswordPairs != null) { + allPasswordPairs.addAll(jobPasswordPairs); + } + + MaskPasswordsConfig config = MaskPasswordsConfig.getInstance(); + List globalPasswordPairs = config.getGlobalVarPasswordPairs(); + if (globalPasswordPairs != null) { + allPasswordPairs.addAll(globalPasswordPairs); + } + + return allPasswordPairs; + } + } + } + return allPasswordPairs; + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java new file mode 100644 index 0000000..5901b59 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java @@ -0,0 +1,129 @@ +/* + * The MIT License + * + * Copyright 2016 CloudBees, Inc. + * + * 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. + */ + +package io.jenkins.plugins.extlogging.api.integrations.pipeline; + + +import hudson.console.AnnotatedLargeText; +import hudson.model.BuildListener; +import hudson.model.TaskListener; +import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter; +import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod; +import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream; +import io.jenkins.plugins.extlogging.api.SensitiveStringsProvider; +import jenkins.model.logging.LoggingMethod; +import jenkins.model.logging.LoggingMethodLocator; +import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; +import org.jenkinsci.plugins.workflow.graph.FlowNode; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import org.jenkinsci.plugins.workflow.log.LogStorage; + +import javax.annotation.Nonnull; +import java.io.IOException; +import java.io.PrintStream; +import java.util.Collection; + + +/** + * Integrates remote logging with Pipeline builds using an experimental API. + */ +public class ExternalPipelineLogStorage implements LogStorage { + + private final ExternalLoggingMethod lm; + private final WorkflowRun run; + + ExternalPipelineLogStorage(@Nonnull WorkflowRun run, @Nonnull ExternalLoggingMethod lm) { + this.run = run; + this.lm = lm; + } + + @Nonnull + @Override + public BuildListener overallListener() throws IOException, InterruptedException { + final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run); + if (loggingMethod instanceof ExternalLoggingMethod) { + ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod; + return new PipelineListener(run, lm); + } + + // Else - not configured + return null; + } + + @Nonnull + @Override + public TaskListener nodeListener(@Nonnull FlowNode flowNode) throws IOException, InterruptedException { + final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run); + if (loggingMethod instanceof ExternalLoggingMethod) { + ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod; + return new PipelineListener(run, lm); + } + + // Else - not configured + return null; + } + + @Nonnull + @Override + public AnnotatedLargeText overallLog(@Nonnull FlowExecutionOwner.Executable executable, boolean b) { + return null; + } + + @Nonnull + @Override + public AnnotatedLargeText stepLog(@Nonnull FlowNode flowNode, boolean b) { + return null; + } + + + private static class PipelineListener implements BuildListener { + + private static final long serialVersionUID = 1; + + private final Collection sensitiveStrings; + private final ExternalLoggingEventWriter writer; + private transient PrintStream logger; + + PipelineListener(WorkflowRun run, ExternalLoggingMethod method) { + this.writer = method.createWriter(run); + this.sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings(run); + + + } + + PipelineListener(WorkflowRun run, FlowNode node, ExternalLoggingMethod method) { + this(run, method); + writer.addMetadataEntry("flowNodeId", node.getId()); + } + + @Override public PrintStream getLogger() { + if (logger == null) { + logger = new PrintStream(ExternalLoggingOutputStream.createOutputStream(writer, sensitiveStrings)); + } + return logger; + } + + } + +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java new file mode 100644 index 0000000..36a8307 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java @@ -0,0 +1,61 @@ +package io.jenkins.plugins.extlogging.api.integrations.pipeline; + +import hudson.Extension; +import hudson.model.Queue; +import hudson.model.Run; +import hudson.model.queue.SubTask; +import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod; +import io.jenkins.plugins.extlogging.api.integrations.MaskPasswordsSensitiveStringsProvider.MaskSensitiveStringsProvider; +import jenkins.model.logging.LoggingMethod; +import jenkins.model.logging.LoggingMethodLocator; +import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import org.jenkinsci.plugins.workflow.log.LogStorage; +import org.jenkinsci.plugins.workflow.log.LogStorageFactory; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * @author Oleg Nenashev + * @since TODO + */ +@Extension(optional = true) +public class ExternalPipelineLogStorageFactory implements LogStorageFactory { + + private static final Logger LOGGER = Logger.getLogger(MaskSensitiveStringsProvider.class.getName()); + + @CheckForNull + @Override + public LogStorage forBuild(@Nonnull FlowExecutionOwner flowExecutionOwner) { + final WorkflowRun run; + try { + final Queue.Executable executable = flowExecutionOwner.getExecutable(); + final SubTask task = executable.getParent(); + if (task instanceof Run) { + Run r = (Run)task; + if (r instanceof WorkflowRun) { + run = (WorkflowRun) r; + } else { + return null; + } + } else { + return null; + } + } catch (IOException ex) { + LOGGER.log(Level.WARNING, "Failed to locate executable for the execution owner " + flowExecutionOwner, ex); + return null; + } + + final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run); + if (loggingMethod instanceof ExternalLoggingMethod) { + ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod; + return new ExternalPipelineLogStorage(run, lm); + } + + return null; + } +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java new file mode 100644 index 0000000..933c701 --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java @@ -0,0 +1,37 @@ +package io.jenkins.plugins.extlogging.api.util; + +import hudson.model.Action; +import hudson.model.Run; + +/** + * Wrapper base, which is required to nest {@code buildCaption.jelly}. + * @author Oleg Nenashev + */ +public abstract class AbstractConsoleAction implements Action { + private final String jobId; + private final Run run; + + public AbstractConsoleAction(Run run) { + this.run = run; + this.jobId = UniqueIdHelper.getOrCreateId(run); + } + + @Override + public String getDisplayName() { + return "External log (" + getDataSourceDisplayName() + ")"; + } + + public Run getRun() { + return run; + } + + public String getJobId() { + return jobId; + } + + public boolean isLogUpdated() { + return run.isLogUpdated(); + } + + public abstract String getDataSourceDisplayName(); +} diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java new file mode 100644 index 0000000..9ef713f --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java @@ -0,0 +1,152 @@ +/* + * The MIT License + * + * Copyright (c) 2010-2011, Manufacture Francaise des Pneumatiques Michelin, + * Romain Seguy + * + * 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. + */ + +package io.jenkins.plugins.extlogging.api.util; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.console.LineTransformationOutputStream; +import org.apache.commons.lang.StringUtils; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Collection; +import java.util.regex.Pattern; +import javax.annotation.CheckForNull; + +// Copied from the MaskPasswords plugin +/** + * Custom output stream which masks a predefined set of passwords. + * + * @author Romain Seguy (http://openromain.blogspot.com) + */ +public class MaskSecretsOutputStream extends LineTransformationOutputStream { + + private final static String MASKED_PASSWORD = "********"; + + private final OutputStream logger; + private final Pattern passwordsAsPattern; + + /** + * @param logger The output stream to which this {@link MaskSecretsOutputStream} + * will write to + * @param secrets A collection of {@link String}s to be masked + * @param regexes A collection of Regular Expression {@link String}s to be masked + */ + public MaskSecretsOutputStream(OutputStream logger, @CheckForNull Collection secrets, @CheckForNull Collection regexes) { + this.logger = logger; + + + if((secrets != null && secrets.size() > 0) || (regexes != null && regexes.size() > 0)) { + // passwords are aggregated into a regex which is compiled as a pattern + // for efficiency + StringBuilder regex = new StringBuilder().append('('); + + int nbMaskedPasswords = 0; + + if(secrets != null && secrets.size() > 0) { + for(String password: secrets) { + if(StringUtils.isNotEmpty(password)) { // we must not handle empty passwords + regex.append(Pattern.quote(password)); + regex.append('|'); + try { + String encodedPassword = URLEncoder.encode(password, "UTF-8"); + if (!encodedPassword.equals(password)) { + // add to masking regex + regex.append(Pattern.quote(encodedPassword)); + regex.append('|'); + } + } catch (UnsupportedEncodingException e) { + // ignore any encoding problem => status quo + } + nbMaskedPasswords++; + } + } + } + if(regexes != null && regexes.size() > 0) { + for(String user_regex: regexes) { + if(StringUtils.isNotEmpty(user_regex)) { // we must not handle empty passwords + regex.append(user_regex); + regex.append('|'); + nbMaskedPasswords++; + } + } + } + + if(nbMaskedPasswords++ >= 1) { // is there at least one password to mask? + regex.deleteCharAt(regex.length()-1); // removes the last unuseful pipe + regex.append(')'); + passwordsAsPattern = Pattern.compile(regex.toString()); + } + else { // no passwords to hide + passwordsAsPattern = null; + } + } + else { // no passwords to hide + passwordsAsPattern = null; + } + } + + /** + * @param logger The output stream to which this {@link MaskSecretsOutputStream} + * will write to + * @param passwords A collection of {@link String}s to be masked + */ + public MaskSecretsOutputStream(OutputStream logger, @CheckForNull Collection passwords) { + this(logger, passwords, null); + } + + // TODO: The logic relies on the default encoding, which may cause issues when master and agent have different encodings + @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "Open TODO item for wider rework") + @Override + protected void eol(byte[] bytes, int len) throws IOException { + String line = new String(bytes, 0, len); + if(passwordsAsPattern != null) { + line = passwordsAsPattern.matcher(line).replaceAll(MASKED_PASSWORD); + } + logger.write(line.getBytes()); + } + + /** + * {@inheritDoc} + * @throws IOException + */ + @Override + public void close() throws IOException { + super.close(); + logger.close(); + } + + /** + * {@inheritDoc} + * @throws IOException + */ + @Override + public void flush() throws IOException { + super.flush(); + logger.flush(); + } +} \ No newline at end of file diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java new file mode 100644 index 0000000..5e8c05b --- /dev/null +++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java @@ -0,0 +1,35 @@ +package io.jenkins.plugins.extlogging.api.util; + +import hudson.model.Run; +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; +import jenkins.model.Jenkins; +import org.jenkinsci.plugins.uniqueid.IdStore; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; + +/** + * Creates on-demand Unique IDs. + * @author Oleg Nenashev + */ +public class UniqueIdHelper { + + @CheckForNull + public static String getOrCreateId(@Nonnull Run run) { + return getOrCreateId(run.getParent()); + } + + @CheckForNull + public static String getOrCreateId(@Nonnull hudson.model.Job job) { + if (Jenkins.getInstance() == null) { + return null; + } + + String id = IdStore.getId(job); + if (id == null) { + IdStore.makeId(job); + id = IdStore.getId(job);; + } + return id; + } +} diff --git a/external-logging-api/src/main/resources/index.jelly b/external-logging-api/src/main/resources/index.jelly new file mode 100644 index 0000000..dd3e91d --- /dev/null +++ b/external-logging-api/src/main/resources/index.jelly @@ -0,0 +1,5 @@ + + +
+ A Jenkins plugin to keep artifacts and Pipeline stashes in Amazon S3. +
diff --git a/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly b/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly new file mode 100644 index 0000000..3def4f6 --- /dev/null +++ b/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly @@ -0,0 +1,53 @@ + + + + + +

+ +
+ + +
+ ${%Progress}: + + + + +
+
+ + + + ${%Console Output from} ${it.dataSourceDisplayName} +

+ + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..78d9952 --- /dev/null +++ b/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + + org.jenkins-ci.plugins + plugin + 3.15 + + + + io.jenkins.plugins.external-logging + external-logging-parent-pom + Temporary Parent POM + ${revision}${changelist} + pom + + + 8 + + + + external-logging-api + external-logging-elasticsearch + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + From f581b7f455ea7b73fec23df2fc79cc09e7883472 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Mon, 9 Jul 2018 15:40:03 +0200 Subject: [PATCH 02/23] Elasticsearch/Logstash Reference implementation prototype --- .../.mvn/extensions.xml | 7 + .../.mvn/maven.config | 2 + external-logging-elasticsearch/Jenkinsfile | 1 + external-logging-elasticsearch/README.md | 2 + external-logging-elasticsearch/pom.xml | 73 +++++ .../elasticsearch/ElasticsearchLogAction.java | 289 ++++++++++++++++++ .../ElasticsearchLogBrowser.java | 10 + .../elasticsearch/util/HttpGetWithData.java | 73 +++++ .../logstash/LogstashDaoLoggingMethod.java | 74 +++++ .../logstash/RemoteLogstashOutputStream.java | 83 +++++ .../logstash/RemoteLogstashWriter.java | 82 +++++ .../src/main/resources/index.jelly | 5 + .../ElasticsearchLogAction/index.jelly | 43 +++ 13 files changed, 744 insertions(+) create mode 100644 external-logging-elasticsearch/.mvn/extensions.xml create mode 100644 external-logging-elasticsearch/.mvn/maven.config create mode 100644 external-logging-elasticsearch/Jenkinsfile create mode 100644 external-logging-elasticsearch/README.md create mode 100644 external-logging-elasticsearch/pom.xml create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction.java create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java create mode 100644 external-logging-elasticsearch/src/main/resources/index.jelly create mode 100644 external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly diff --git a/external-logging-elasticsearch/.mvn/extensions.xml b/external-logging-elasticsearch/.mvn/extensions.xml new file mode 100644 index 0000000..510f24f --- /dev/null +++ b/external-logging-elasticsearch/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.0-beta-3 + + diff --git a/external-logging-elasticsearch/.mvn/maven.config b/external-logging-elasticsearch/.mvn/maven.config new file mode 100644 index 0000000..2a0299c --- /dev/null +++ b/external-logging-elasticsearch/.mvn/maven.config @@ -0,0 +1,2 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals diff --git a/external-logging-elasticsearch/Jenkinsfile b/external-logging-elasticsearch/Jenkinsfile new file mode 100644 index 0000000..5b60d43 --- /dev/null +++ b/external-logging-elasticsearch/Jenkinsfile @@ -0,0 +1 @@ +buildPlugin(platforms: ['linux']) diff --git a/external-logging-elasticsearch/README.md b/external-logging-elasticsearch/README.md new file mode 100644 index 0000000..b991085 --- /dev/null +++ b/external-logging-elasticsearch/README.md @@ -0,0 +1,2 @@ +# External Logging for Elasticsearch and Logstash plugin + diff --git a/external-logging-elasticsearch/pom.xml b/external-logging-elasticsearch/pom.xml new file mode 100644 index 0000000..476be78 --- /dev/null +++ b/external-logging-elasticsearch/pom.xml @@ -0,0 +1,73 @@ + + + 4.0.0 + + + org.jenkins-ci.plugins + plugin + 3.15 + + + + io.jenkins.plugins.external-logging + external-logging-elasticsearch + Elasticsearch External Logging plugin + The plugin implements external logging to Elasticsearch + https://wiki.jenkins.io/display/JENKINS/External+Logging+API+Plugin + ${revision}${changelist} + hpi + + + 1.0-alpha-1 + -SNAPSHOT + 2.131-SNAPSHOT + 8 + true + + + + + MIT License + https://opensource.org/licenses/MIT + + + + + scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git + scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git + https://github.com/jenkinsci/${project.artifactId}-plugin + ${scmTag} + + + + + io.jenkins.plugins.external-logging + external-logging-api + 1.0-alpha-1-SNAPSHOT + + + org.jenkins-ci.plugins + logstash + 2.1.0 + + + org.jenkins-ci.plugins + structs + 1.14 + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction.java new file mode 100644 index 0000000..833bca1 --- /dev/null +++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction.java @@ -0,0 +1,289 @@ +package io.jenkins.plugins.extlogging.elasticsearch; + +import com.jcraft.jzlib.GZIPInputStream; +import com.trilead.ssh2.crypto.Base64; +import hudson.console.AnnotatedLargeText; +import hudson.console.ConsoleAnnotationOutputStream; +import hudson.console.ConsoleAnnotator; +import hudson.model.Run; +import hudson.remoting.ObjectInputStreamEx; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.Writer; +import static java.lang.Math.abs; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; +import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; + +import io.jenkins.plugins.extlogging.api.util.AbstractConsoleAction; +import io.jenkins.plugins.extlogging.api.util.UniqueIdHelper; +import io.jenkins.plugins.extlogging.elasticsearch.util.HttpGetWithData; +import jenkins.model.Jenkins; +import jenkins.plugins.logstash.LogstashConfiguration; +import jenkins.plugins.logstash.persistence.ElasticSearchDao; +import jenkins.plugins.logstash.persistence.LogstashIndexerDao; +import jenkins.security.CryptoConfidentialKey; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.commons.io.IOUtils; +import org.apache.commons.jelly.XMLOutput; +import org.apache.commons.lang.StringUtils; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; +import org.kohsuke.stapler.Stapler; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.framework.io.ByteBuffer; + +/** + * Displays Embedded log. + * @author Oleg Nenashev + */ +@Restricted(NoExternalUse.class) +public class ElasticsearchLogAction extends AbstractConsoleAction { + + public ElasticsearchLogAction(Run run) { + super(run); + } + + private transient HttpClientBuilder clientBuilder; + + @Override + public String getIconFileName() { + return "terminal.png"; + } + + @Override + public String getUrlName() { + return "externalLog"; + } + + @Override + public String getDataSourceDisplayName() { + return "Elasticsearch"; + } + + /** + * Used from index.jelly to write annotated log to the given + * output. + * @param offset offset of the log + * @param out destination output + */ + public void writeLogTo(long offset, @Nonnull XMLOutput out) throws IOException { + try { + getLogText().writeHtmlTo(offset, out.asWriter()); + } catch (IOException e) { + // try to fall back to the old getLogInputStream() + // mainly to support .gz compressed files + // In this case, console annotation handling will be turned off. + InputStream input = readLogToBuffer(offset).newInputStream(); + try { + IOUtils.copy(input, out.asWriter()); + } finally { + IOUtils.closeQuietly(input); + } + } + } + + /** + * Used to URL-bind {@link AnnotatedLargeText}. + * @return A {@link Run} log with annotations + */ + public @Nonnull AnnotatedLargeText getLogText() { + ByteBuffer buf; + try { + buf = readLogToBuffer(0); + } catch (IOException ex) { + buf = new ByteBuffer(); + } + return new UncompressedAnnotatedLargeText(buf, StandardCharsets.UTF_8, !isLogUpdated(), this); + } + + /** + * Returns an input stream that reads from the log file. + * @throws IOException Operation error + */ + @Nonnull + public ByteBuffer readLogToBuffer(long initialOffset) throws IOException { + LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance(); + if (!(dao instanceof ElasticSearchDao)) { + throw new IOException("Cannot brows logs, Elasticsearch Dao must be configured in the Logstash plugin"); + } + ElasticSearchDao esDao = (ElasticSearchDao)dao; + + ByteBuffer buffer = new ByteBuffer(); + Collection pulledLogs = pullLogs(getRun(), esDao,0, Long.MAX_VALUE); + long ctr = 0; + for (String logEntry : pulledLogs) { + byte[] bytes = logEntry.getBytes(); + + buffer.write(bytes, 0, bytes.length); + buffer.write('\n'); + + } + return buffer; + } + + private Collection pullLogs(Run run, ElasticSearchDao dao, long sinceMs, long toMs) throws IOException { + CloseableHttpClient httpClient = null; + CloseableHttpResponse response = null; + + // Determine job id + String jobId = UniqueIdHelper.getOrCreateId(run); + + // Prepare query + String query = "{\n" + + " \"fields\": [\"message\",\"@timestamp\"], \n" + + " \"size\": 9999, \n" + // TODO use paging https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-from-size.html + " \"query\": { \n" + + " \"bool\": { \n" + + " \"must\": [\n" + + " { \"match\": { \"data.jobId\": \"" + jobId + "\"}}, \n" + + " { \"match\": { \"data.buildNum\": \"" + run.getNumber() + "\" }} \n" + + " ]\n" + + " }\n" + + " }\n" + + "}"; + + + // Prepare request + final HttpGetWithData getRequest = new HttpGetWithData(dao.getUri() + "/_search"); + final StringEntity input = new StringEntity(query, ContentType.APPLICATION_JSON); + getRequest.setEntity(input); + + if (dao.getUsername() != null) { + //TODO: Make the logic public in the Logstash plugin + String auth = org.apache.commons.codec.binary.Base64.encodeBase64String( + (dao.getUsername() + ":" + StringUtils.defaultString(dao.getPassword())).getBytes(StandardCharsets.UTF_8)); + getRequest.addHeader("Authorization", "Basic " + auth); + } + + try { + httpClient = clientBuilder().build(); + response = httpClient.execute(getRequest); + + if (response.getStatusLine().getStatusCode() != 200) { + throw new IOException(HttpGetWithData.getErrorMessage(dao.getUri(), response)); + } + + // TODO: retrieve log entries + final String content; + try(InputStream i = response.getEntity().getContent()) { + content = IOUtils.toString(i); + } + + final JSONObject json = JSONObject.fromObject(content); + JSONArray jsonArray = json.getJSONObject("hits").getJSONArray("hits"); + ArrayList res = new ArrayList<>(jsonArray.size()); + for (int i=0; i " +message); + } + Collections.sort(res); + return res; + + } finally { + if (response != null) { + response.close(); + } + if (httpClient != null) { + httpClient.close(); + } + } + } + + HttpClientBuilder clientBuilder() { + if (clientBuilder == null) { + clientBuilder = HttpClientBuilder.create(); + } + return clientBuilder; + } + + public static class UncompressedAnnotatedLargeText extends AnnotatedLargeText { + + private T context; + private ByteBuffer memory; + + public UncompressedAnnotatedLargeText(ByteBuffer memory, Charset charset, boolean completed, T context) { + super(memory, charset, completed, context); + this.context = context; + this.memory = memory; + } + + @Override + public long writeHtmlTo(long start, Writer w) throws IOException { + ConsoleAnnotationOutputStream caw = new ConsoleAnnotationOutputStream( + w, createAnnotator(Stapler.getCurrentRequest()), context, charset); + long r = super.writeLogTo(start, caw); + caw.flush(); + long initial = memory.length(); + /* + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + Cipher sym = PASSING_ANNOTATOR.encrypt(); + ObjectOutputStream oos = new ObjectOutputStream(new GZIPOutputStream(new CipherOutputStream(baos, sym))); + oos.writeLong(System.currentTimeMillis()); // send timestamp to prevent a replay attack + oos.writeObject(caw.getConsoleAnnotator()); + oos.close(); + StaplerResponse rsp = Stapler.getCurrentResponse(); + if (rsp != null) { + rsp.setHeader("X-ConsoleAnnotator", new String(Base64.encode(baos.toByteArray()))); + } + return r; + */ + + /* + try { + memory.writeTo(caw); + } finally { + caw.flush(); + caw.close(); + }*/ + return initial - memory.length(); + } + + /** + * Used for sending the state of ConsoleAnnotator to the client, because we are deserializing this object later. + */ + private static final CryptoConfidentialKey PASSING_ANNOTATOR = new CryptoConfidentialKey(AnnotatedLargeText.class,"consoleAnnotator"); + + + private ConsoleAnnotator createAnnotator(StaplerRequest req) throws IOException { + try { + String base64 = req!=null ? req.getHeader("X-ConsoleAnnotator") : null; + if (base64!=null) { + Cipher sym = PASSING_ANNOTATOR.decrypt(); + + ObjectInputStream ois = new ObjectInputStreamEx(new GZIPInputStream( + new CipherInputStream(new ByteArrayInputStream(Base64.decode(base64.toCharArray())),sym)), + Jenkins.getInstance().pluginManager.uberClassLoader); + try { + long timestamp = ois.readLong(); + if (TimeUnit.HOURS.toMillis(1) > abs(System.currentTimeMillis()-timestamp)) + // don't deserialize something too old to prevent a replay attack + return (ConsoleAnnotator)ois.readObject(); + } finally { + ois.close(); + } + } + } catch (ClassNotFoundException e) { + throw new IOException(e); + } + // start from scratch + return ConsoleAnnotator.initial(context==null ? null : context.getClass()); + } + } +} \ No newline at end of file diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java new file mode 100644 index 0000000..e18aff6 --- /dev/null +++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java @@ -0,0 +1,10 @@ +package io.jenkins.plugins.extlogging.elasticsearch; + +import jenkins.model.logging.LogBrowser; + +/** + * @author Oleg Nenashev + * @since TODO + */ +public class ElasticsearchLogBrowser extends LogBrowser { +} diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java new file mode 100644 index 0000000..549d7e7 --- /dev/null +++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java @@ -0,0 +1,73 @@ +package io.jenkins.plugins.extlogging.elasticsearch.util; + +import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.http.Header; +import org.apache.http.HttpEntity; +import org.apache.http.HttpEntityEnclosingRequest; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.protocol.HTTP; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.nio.charset.StandardCharsets; + +@Restricted(NoExternalUse.class) +public class HttpGetWithData extends HttpGet implements HttpEntityEnclosingRequest { + private HttpEntity entity; + + public HttpGetWithData(String uri) { + super(uri); + } + + @Override + public HttpEntity getEntity() { + return this.entity; + } + + @Override + public void setEntity(final HttpEntity entity) { + this.entity = entity; + } + + @Override + public boolean expectContinue() { + final Header expect = getFirstHeader(HTTP.EXPECT_DIRECTIVE); + return expect != null && HTTP.EXPECT_CONTINUE.equalsIgnoreCase(expect.getValue()); + } + + public static String getErrorMessage(URI uri, CloseableHttpResponse response) { + ByteArrayOutputStream byteStream = null; + PrintStream stream = null; + try { + byteStream = new ByteArrayOutputStream(); + stream = new PrintStream(byteStream, true, StandardCharsets.UTF_8.name()); + + try { + stream.print("HTTP error code: "); + stream.println(response.getStatusLine().getStatusCode()); + stream.print("URI: "); + stream.println(uri.toString()); + stream.println("RESPONSE: " + response.toString()); + response.getEntity().writeTo(stream); + } catch (IOException e) { + stream.println(ExceptionUtils.getStackTrace(e)); + } + stream.flush(); + return byteStream.toString(StandardCharsets.UTF_8.name()); + } + catch (UnsupportedEncodingException e) + { + return ExceptionUtils.getStackTrace(e); + } finally { + if (stream != null) { + stream.close(); + } + } + } +} \ No newline at end of file diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java new file mode 100644 index 0000000..27f4a23 --- /dev/null +++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java @@ -0,0 +1,74 @@ +package io.jenkins.plugins.extlogging.logstash; + +import hudson.model.Run; +import hudson.model.TaskListener; +import java.io.OutputStream; +import java.util.List; + +import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter; +import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod; +import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream; +import jenkins.model.logging.LogBrowser; +import jenkins.plugins.logstash.LogstashConfiguration; +import jenkins.plugins.logstash.persistence.LogstashIndexerDao; + +import javax.annotation.CheckForNull; + +/** + * Perform logging to {@link LogstashIndexerDao}. + * + * @author Oleg Nenashev + */ +public class LogstashDaoLoggingMethod extends ExternalLoggingMethod { + + String prefix; + + @CheckForNull + @Override + public LogBrowser getDefaulLogBrowser() { + return null; + } + + @Override + public ExternalLoggingEventWriter createWriter(Run run) { + LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance(); + return new RemoteLogstashWriter(run, TaskListener.NULL, prefix, dao); + } + + @Override + public OutputStream decorateLogger(Run run, OutputStream logger) { + // LogstashWriter logstash = new LogstashWriter(run, TaskListener.NULL, logger, prefix); + // RemoteLogstashOutputStream los = new RemoteLogstashOutputStream(logstash, "prefix"); + // return los.maskPasswords(SensitiveStringsProvider.getAllSensitiveStrings(run)); + // TODO: implement + return null; + } + + + + private static class LogstashOutputStreamWrapper implements OutputStreamWrapper { + + private final RemoteLogstashWriter wr; + private final List passwordStrings; + + public LogstashOutputStreamWrapper(RemoteLogstashWriter wr, List passwordStrings, String prefix) { + this.wr = wr; + this.passwordStrings = passwordStrings; + } + + public Object readResolve() { + return ExternalLoggingOutputStream.createOutputStream(wr, passwordStrings); + } + + @Override + public OutputStream toRawOutputStream() { + return toSerializableOutputStream(); + } + + @Override + public OutputStream toSerializableOutputStream() { + return ExternalLoggingOutputStream.createOutputStream(wr, passwordStrings); + } + } + +} \ No newline at end of file diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java new file mode 100644 index 0000000..a126e6d --- /dev/null +++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java @@ -0,0 +1,83 @@ +/* + * The MIT License + * + * Copyright 2014 K Jonathan Harker & Rusty Gerard + * + * 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. + */ +package io.jenkins.plugins.extlogging.logstash; + +import hudson.console.ConsoleNote; +import hudson.console.LineTransformationOutputStream; +import io.jenkins.plugins.extlogging.api.util.MaskSecretsOutputStream; + +import java.io.IOException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + + +public class RemoteLogstashOutputStream extends LineTransformationOutputStream { + + final RemoteLogstashWriter logstash; + final String prefix; + + private static final Logger LOGGER = Logger.getLogger(RemoteLogstashOutputStream.class.getName()); + + public RemoteLogstashOutputStream(RemoteLogstashWriter logstash, String prefix) { + super(); + this.logstash = logstash; + this.prefix = prefix; + } + + + public MaskSecretsOutputStream maskPasswords(List passwordStrings) { + return new MaskSecretsOutputStream(this, passwordStrings); + } + + @Override + protected void eol(byte[] b, int len) throws IOException { + try { + this.flush(); + if (!logstash.isConnectionBroken()) { + String line = new String(b, 0, len).trim(); + line = ConsoleNote.removeNotes(line); + logstash.writeMessage(prefix + line); + } + } catch (Throwable ex) { + LOGGER.log(Level.SEVERE, "BOOM", ex); + } + } + + /** + * {@inheritDoc} + */ + @Override + public void flush() throws IOException { + super.flush(); + } + + /** + * {@inheritDoc} + */ + @Override + public void close() throws IOException { + super.close(); + } +} diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java new file mode 100644 index 0000000..ecc052d --- /dev/null +++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java @@ -0,0 +1,82 @@ + +package io.jenkins.plugins.extlogging.logstash; + +import hudson.model.Run; +import hudson.model.TaskListener; +import io.jenkins.plugins.extlogging.api.Event; +import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter; +import jenkins.model.Jenkins; +import jenkins.plugins.logstash.persistence.BuildData; +import jenkins.plugins.logstash.persistence.LogstashIndexerDao; +import net.sf.json.JSONObject; +import org.apache.commons.lang.exception.ExceptionUtils; + +import java.io.IOException; +import java.util.Collections; +import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class RemoteLogstashWriter extends ExternalLoggingEventWriter { + + private static final long serialVersionUID = 1L; + private static final Logger LOGGER = Logger.getLogger(RemoteLogstashWriter.class.getName()); + + final String prefix; + final BuildData buildData; + final String jenkinsUrl; + LogstashIndexerDao dao; + private boolean connectionBroken; + + public RemoteLogstashWriter(Run run, TaskListener listener, String prefix, LogstashIndexerDao dao) { + this.prefix = prefix; + this.jenkinsUrl = Jenkins.get().getRootUrl(); + this.buildData = new BuildData(run, new Date(), listener); + this.dao = dao; + } + + @Override + public void writeMessage(String message) throws IOException { + super.writeMessage(prefix != null ? prefix + message : message); + } + + @Override + public void writeEvent(Event event) { + JSONObject payload = dao.buildPayload(buildData, jenkinsUrl, + Collections.singletonList(event.getMessage())); + // TODO: append custom data passed in the event + try { + dao.push(payload.toString()); + } catch (IOException e) { + String msg = "[logstash-plugin]: Failed to send log data to " + dao.getDescription() + ".\n" + + "[logstash-plugin]: No Further logs will be sent to " + dao.getDescription() + ".\n" + + ExceptionUtils.getStackTrace(e); + logErrorMessage(msg); + } + } + + /** + * @return True if errors have occurred during initialization or write. + */ + public boolean isConnectionBroken() { + return connectionBroken || dao == null || buildData == null; + } + + /** + * Write error message to errorStream and set connectionBroken to true. + */ + private void logErrorMessage(String msg) { + connectionBroken = true; + LOGGER.log(Level.WARNING, msg); + } + + @Override + public void flush() throws IOException { + // no caching, nothing to do here + } + + @Override + public void close() throws IOException { + // dao handles it + } +} diff --git a/external-logging-elasticsearch/src/main/resources/index.jelly b/external-logging-elasticsearch/src/main/resources/index.jelly new file mode 100644 index 0000000..dd3e91d --- /dev/null +++ b/external-logging-elasticsearch/src/main/resources/index.jelly @@ -0,0 +1,5 @@ + + +
+ A Jenkins plugin to keep artifacts and Pipeline stashes in Amazon S3. +
diff --git a/external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly b/external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly new file mode 100644 index 0000000..469cce9 --- /dev/null +++ b/external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly @@ -0,0 +1,43 @@ + + + + + + + + + + + + + ${%skipSome(offset/1024,"consoleFull")} + + + + + + + + + + + + 
+            

+               
+            

+          
+        
+        
+        
+          
+            
+            ${it.writeLogTo(offset,output)}
+          

+        
+      
+ 
+  
+    
+
\ No newline at end of file

From 878ab4acef07f295e9ed46abb68d120e269a2f62 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 9 Jul 2018 16:53:50 +0200
Subject: [PATCH 03/23] Add config Jelly for the external configuration

---
 .../impl/ExternalLoggingGlobalConfiguration/config.jelly  | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly

diff --git a/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly b/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly
new file mode 100644
index 0000000..5500e56
--- /dev/null
+++ b/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly
@@ -0,0 +1,8 @@
+
+
+
+
+  
+    
+  
+

From 94fc9464cb8c8366abf78b2c5fbbc4daacd56674 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 9 Jul 2018 17:31:05 +0200
Subject: [PATCH 04/23] Add smoke tests for ExternalLogging API

---
 .../jenkins/plugins/extlogging/api/Event.java |  9 +++
 .../pipeline/ExternalPipelineLogStorage.java  |  2 +-
 .../extlogging/api/FreestyleJobTest.java      | 50 ++++++++++++++++
 .../extlogging/api/PipelineSmokeTest.java     | 52 +++++++++++++++++
 .../util/MockExternalLoggingEventWriter.java  | 50 ++++++++++++++++
 .../extlogging/api/util/MockLogBrowser.java   | 17 ++++++
 .../api/util/MockLoggingMethod.java           | 57 +++++++++++++++++++
 7 files changed, 236 insertions(+), 1 deletion(-)
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java

diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
index 0744259..d15ee80 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
@@ -35,4 +35,13 @@ public long getTimestamp() {
     public Map getData() {
         return data;
     }
+
+    @Override
+    public String toString() {
+        return String.format("[%d] - %s", timestamp, message);
+    }
+
+    public String toStringWithData() {
+        return String.format("[%d] - %s: %s", timestamp, message, data);
+    }
 }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
index 5901b59..b0df7de 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
@@ -77,7 +77,7 @@ public TaskListener nodeListener(@Nonnull FlowNode flowNode) throws IOException,
         final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run);
         if (loggingMethod instanceof ExternalLoggingMethod) {
             ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod;
-            return new PipelineListener(run, lm);
+            return new PipelineListener(run, flowNode, lm);
         }
 
         // Else - not configured
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
new file mode 100644
index 0000000..432dfba
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
@@ -0,0 +1,50 @@
+package io.jenkins.plugins.extlogging.api;
+
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+import hudson.tasks.Shell;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
+import io.jenkins.plugins.extlogging.api.util.MockExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.util.MockLogBrowser;
+import io.jenkins.plugins.extlogging.api.util.MockLoggingMethod;
+import jenkins.model.GlobalConfiguration;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.jvnet.hudson.test.JenkinsRule;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class FreestyleJobTest {
+
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Rule
+    public TemporaryFolder tmpDir = new TemporaryFolder();
+
+    private MockLoggingMethod loggingMethod;
+
+    @Before
+    public void setup() throws Exception {
+        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.get();
+        loggingMethod = new MockLoggingMethod(tmpDir.newFolder("logs"));
+        cfg.setLoggingMethod(loggingMethod);
+        cfg.setLogBrowser(new MockLogBrowser());
+    }
+
+    @Test
+    public void spotcheck() throws Exception {
+        FreeStyleProject project = j.createFreeStyleProject();
+        project.getBuildersList().add(new Shell("echo hello"));
+
+        FreeStyleBuild build = j.buildAndAssertSuccess(project);
+        MockExternalLoggingEventWriter writer = loggingMethod.getWriter(build);
+        Assert.assertTrue(writer.isEventWritten());
+    }
+
+}
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
new file mode 100644
index 0000000..1a28a22
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
@@ -0,0 +1,52 @@
+package io.jenkins.plugins.extlogging.api;
+
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+import hudson.model.Run;
+import hudson.tasks.Shell;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
+import io.jenkins.plugins.extlogging.api.util.MockExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.util.MockLogBrowser;
+import io.jenkins.plugins.extlogging.api.util.MockLoggingMethod;
+import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
+import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.jvnet.hudson.test.JenkinsRule;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class PipelineSmokeTest {
+
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Rule
+    public TemporaryFolder tmpDir = new TemporaryFolder();
+
+    private MockLoggingMethod loggingMethod;
+
+    @Before
+    public void setup() throws Exception {
+        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.get();
+        loggingMethod = new MockLoggingMethod(tmpDir.newFolder("logs"));
+        cfg.setLoggingMethod(loggingMethod);
+        cfg.setLogBrowser(new MockLogBrowser());
+    }
+
+    @Test
+    public void spotcheck_Master() throws Exception {
+        WorkflowJob project = j.createProject(WorkflowJob.class);
+        project.setDefinition(new CpsFlowDefinition("echo Hello", true));
+
+        Run build = j.buildAndAssertSuccess(project);
+        MockExternalLoggingEventWriter writer = loggingMethod.getWriter(build);
+        Assert.assertTrue(writer.isEventWritten());
+    }
+
+}
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
new file mode 100644
index 0000000..c71029d
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
@@ -0,0 +1,50 @@
+package io.jenkins.plugins.extlogging.api.util;
+
+import io.jenkins.plugins.extlogging.api.Event;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class MockExternalLoggingEventWriter extends ExternalLoggingEventWriter {
+
+    public File dest;
+    private FileWriter writer;
+
+    // Debug flags
+    private boolean eventWritten;
+
+    public MockExternalLoggingEventWriter(File dest) throws IOException {
+        this.dest = dest;
+        this.writer = new FileWriter(dest);
+    }
+
+    @Override
+    public void writeEvent(Event event) throws IOException {
+        eventWritten = true;
+        writer.write(event.toStringWithData() + "\n");
+    }
+
+    @Override
+    public void flush() throws IOException {
+        writer.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+        writer.close();
+    }
+
+    public File getDest() {
+        return dest;
+    }
+
+    public boolean isEventWritten() {
+        return eventWritten;
+    }
+}
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
new file mode 100644
index 0000000..7d3bd99
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
@@ -0,0 +1,17 @@
+package io.jenkins.plugins.extlogging.api.util;
+
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
+import jenkins.model.logging.LogBrowser;
+
+import javax.annotation.CheckForNull;
+import java.io.OutputStream;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class MockLogBrowser extends LogBrowser {
+
+}
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
new file mode 100644
index 0000000..9ddf8d6
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
@@ -0,0 +1,57 @@
+package io.jenkins.plugins.extlogging.api.util;
+
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
+import jenkins.model.logging.LogBrowser;
+
+import javax.annotation.CheckForNull;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.HashMap;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class MockLoggingMethod extends ExternalLoggingMethod {
+
+    File baseDir;
+    transient HashMap writers;
+
+    public MockLoggingMethod(File baseDir) {
+        this.baseDir = baseDir;
+    }
+
+    @Override
+    public ExternalLoggingEventWriter createWriter(Run run) {
+        final MockExternalLoggingEventWriter writer;
+        try {
+            writer = new MockExternalLoggingEventWriter(new File(baseDir, run.getFullDisplayName() + ".txt"));
+        } catch (IOException ex) {
+            throw new AssertionError(ex);
+        }
+        writers.put(run, writer);
+        return writer;
+    }
+
+    public HashMap getWriters() {
+        return writers;
+    }
+
+    public MockExternalLoggingEventWriter getWriter(Run run) {
+        return writers.get(run);
+    }
+
+    @Override
+    public OutputStream decorateLogger(Run run, OutputStream logger) {
+        throw new AssertionError("Not Implemented");
+    }
+
+    @CheckForNull
+    @Override
+    public LogBrowser getDefaulLogBrowser() {
+        return new MockLogBrowser();
+    }
+}

From 509d67ea23fbc2fe2e79865aeb8d6454610baeb7 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 9 Jul 2018 17:31:34 +0200
Subject: [PATCH 05/23] Add a Demo draft

---
 demo/Makefile                            | 31 ++++++++
 demo/README.md                           | 72 +++++++++++++++++
 demo/docker-compose.yml                  | 34 ++++++++
 demo/packager-config.yml                 | 99 ++++++++++++++++++++++++
 demo/pom.xml                             | 88 +++++++++++++++++++++
 demo/src/main/groovy/1_System.groovy     | 68 ++++++++++++++++
 demo/src/main/groovy/2_Logstash.groovy   | 19 +++++
 demo/src/main/groovy/3_Agent.groovy      | 15 ++++
 demo/src/main/groovy/4_Jobs.groovy       | 56 ++++++++++++++
 demo/src/main/groovy/5_SaveToDisk.groovy |  3 +
 demo/src/main/java/Stub.java             |  6 ++
 pom.xml                                  |  1 +
 12 files changed, 492 insertions(+)
 create mode 100644 demo/Makefile
 create mode 100644 demo/README.md
 create mode 100644 demo/docker-compose.yml
 create mode 100644 demo/packager-config.yml
 create mode 100644 demo/pom.xml
 create mode 100644 demo/src/main/groovy/1_System.groovy
 create mode 100644 demo/src/main/groovy/2_Logstash.groovy
 create mode 100644 demo/src/main/groovy/3_Agent.groovy
 create mode 100644 demo/src/main/groovy/4_Jobs.groovy
 create mode 100644 demo/src/main/groovy/5_SaveToDisk.groovy
 create mode 100644 demo/src/main/java/Stub.java

diff --git a/demo/Makefile b/demo/Makefile
new file mode 100644
index 0000000..48ca030
--- /dev/null
+++ b/demo/Makefile
@@ -0,0 +1,31 @@
+# Just a Makefile for manual testing
+.PHONY: all
+
+ARTIFACT_ID = jenkins-external-task-logging-elk-demo
+VERSION = 2.121.1-elk-SNAPSHOT
+CWP_VERSION= 0.1-alpha-8
+
+all: clean build
+
+clean:
+	rm -rf tmp
+	mkdir tmp
+
+build: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
+
+tmp/cwp-cli.jar:
+	mvn com.googlecode.maven-download-plugin:download-maven-plugin:1.4.0:artifact \
+		-DgroupId=io.jenkins.tools.custom-war-packager \
+		-DartifactId=custom-war-packager-cli \
+		-Dclassifier=jar-with-dependencies \
+		-Dversion=${CWP_VERSION} \
+		-DoutputDirectory=tmp \
+		-DoutputFileName=cwp-cli.jar
+
+tmp/output/target/${ARTIFACT_ID}-${VERSION}.war: tmp/cwp-cli.jar
+	java -jar tmp/cwp-cli.jar \
+	    -configPath packager-config.yml -version ${VERSION}
+
+run: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
+	docker-compose rm -fv
+	docker-compose up --build --force-recreate jenkins elk
diff --git a/demo/README.md b/demo/README.md
new file mode 100644
index 0000000..6e1825a
--- /dev/null
+++ b/demo/README.md
@@ -0,0 +1,72 @@
+External Task Logging to Elasticsearch Demo
+===
+
+This demo packages Jenkins WAR for External Task Logging to Elasticsearch with help of Logstash plugin.
+
+This demo includes [Logstash Plugin PR#18](https://github.com/jenkinsci/logstash-plugin/pull/18) and
+all its upstream dependencies. 
+It also bundles auto-configuration System Groovy scripts, so that the WAR file starts
+up with pre-configured Logstash plugin settings and some other configs.
+
+Features of the demo:
+
+* Pipeline jobs logging goes to Elasticsearch
+* When tasks are executed on agents, the logs get posted to Elasticsearch directly
+  without passing though the master and causing scalability issues
+* Pipeline jobs override standard Log actions in the Jenkins core, so the
+  underlying implementation is transparent to users
+* Secrets are escaped in stored/displayed logs when running on master and agents.
+* Console annotations work as they work for common Jenkins instances
+* Log blocks are collapsible in the _Console_ screen
+* Origin container ID of every message is visible in Kibana (if you have set that up) via sender field
+
+The demo can be run in Docker Compose,
+ELK stack is provided by the [sebp/elk](https://hub.docker.com/r/sebp/elk/)  image in this case.
+
+## Prerequisites
+
+* Docker and Docker Compose are installed
+
+## Building demo
+
+To build the demo...
+
+1. Go to the repository root, run `mvn clean package` to build Jenkins Custom WAR Packager
+2. Change directory to the demo root
+3. Run `make build`
+
+First build may take a while, because the packager will need to checkout and build 
+many repositories.
+
+## Running demo
+
+1. Run `make run`. It will spin up the demo with predefined environment.
+   Jenkins will be available on the port 8080, credentials: `admin/admin`
+2. If you want to run demo jobs on the agent, 
+also run `docker-compose up agent` in a separate terminal window
+3. In order to access the instance, use the "admin/admin" credentials.
+4. Run one of the demo jobs.   
+5. Browse logs
+  * Classic Log action queries data from Elasticsearch
+  * There is a _Log (Kibana)_ action in runs, which shows Kibana. 
+  * In order to see Kibana logs, you will need to configure the default index in the 
+    embedded page once Jenkins starts up. Use `logstash/` as a default index and 
+    `@timestamp` as data source
+
+## Manual run
+
+This guideline allows to run the demo locally.
+Only Logstash will be preconfigured.
+
+1. Run `docker run -p 5601:5601 -p 9200:9200 -p 5044:5044 -it --name elk sebp/elk:es241_l240_k461` 
+to start the Docker container to to expose ports
+2. Run Jenkins using `JENKINS_HOME=$(pwd)/work java -jar tmp/output/target/external-task-logging-elk-2.107.3-elk-SNAPSHOT.war --httpPort=8080 --prefix=/jenkins` 
+(or just `run run.sh`).
+  * If needed, the demo can be configured by setting system properties
+  * `elasticsearch.host` - host, defaults to `http://elk`
+  * `elasticsearch.port` - Elasticsearch port, defaults to `9200`
+  * `logstash.key` - Path to the root index/key for logging, defaults to `/logstash/logs`
+  * `elasticsearch.username` and `elasticsearch.password` - 
+3. Pass through the installation Wizard
+4. Create a Pipeline job with some logging (e.g. `echo` commands), run it
+5. Browse logs (see above)
diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
new file mode 100644
index 0000000..3ba37a4
--- /dev/null
+++ b/demo/docker-compose.yml
@@ -0,0 +1,34 @@
+version: '3'
+
+services:
+  elk:
+    image: sebp/elk:es241_l240_k461
+    container_name: elk
+    ports:
+      - "5601:5601" # Kibana
+      - "9200:9200" # Elasticsearch
+      - "5044:5044" # Logstash
+    expose:
+      - "5601"
+      - "9200"
+      - "5044"
+  jenkins:
+    image: jenkins/demo-external-task-logging-elk:latest
+    container_name: jenkins
+    links:
+      - elk
+    environment:
+      - JAVA_OPTS=-Dio.jenkins.demo.external-task-logging-elk.enabled=true -Djenkins.install.runSetupWizard=false
+    ports:
+      - "8080:8080"
+      - "9000:9000"
+    expose:
+      - "8080"
+      - "9000"
+  agent:
+    image: cloudbees/jnlp-slave-with-java-build-tools:2.2.0
+    links:
+      - elk
+      - jenkins
+    # TODO there is no -noreconnect yet this does not work when first started; you need to relaunch it; work around with wait-for-it: https://docs.docker.com/compose/startup-order/
+    command: -url http://jenkins:8080/ f9bf0c290371481814f8bc235e3c53736ea9cd9f11b466b76ad794b91cb57a0b -workDir "/home/jenkins" agent
diff --git a/demo/packager-config.yml b/demo/packager-config.yml
new file mode 100644
index 0000000..5f9f7ae
--- /dev/null
+++ b/demo/packager-config.yml
@@ -0,0 +1,99 @@
+bundle:
+  groupId: "io.jenkins.tools.war-packager.demo"
+  artifactId: "jenkins-external-task-logging-elk-demo"
+  vendor: "Jenkins project"
+  title: "Jenkins External Task Logging demo for Elasticsearch"
+  description: "Jenkins External Task Logging demo for Elasticsearch, packaged as a single WAR file. It automatically configures logging on startup"
+buildSettings:
+  docker:
+    base: "jenkins/jenkins:2.121.1"
+    tag: "jenkins/demo-external-task-logging-elk"
+    build: true
+war:
+  groupId: "org.jenkins-ci.main"
+  artifactId: "jenkins-war"
+  source:
+    version: 2.131-SNAPSHOT
+plugins:
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "structs"
+    source:
+      version: 1.14
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "scm-api"
+    source:
+      version: 2.2.7
+  - groupId: "org.jenkins-ci.plugins.workflow"
+    artifactId: "workflow-aggregator"
+    source:
+      version: 2.5
+  - groupId: "org.jenkins-ci.plugins.workflow"
+    artifactId: "workflow-api"
+    source:
+      version: 2.29-rc219.239019e84015
+    build:
+      buildOriginalVersion: true
+  - groupId: "org.jenkins-ci.plugins.workflow"
+    artifactId: "workflow-step-api"
+    source:
+      version: 2.15
+  - groupId: "org.jenkins-ci.plugins.workflow"
+    artifactId: "workflow-support"
+    source:
+      version: 2.19-rc265.3e5e4aeecfff
+    build:
+      buildOriginalVersion: true
+  - groupId: "org.jenkins-ci.plugins.workflow"
+    artifactId: "workflow-job"
+    source:
+      version: 2.22-rc311.5616213fbed0
+    build:
+      buildOriginalVersion: true
+  - groupId: "org.jenkins-ci.plugins.workflow"
+    artifactId: "workflow-durable-task-step"
+    source:
+      version: 2.20-rc333.74dc7c303e6d
+    build:
+      buildOriginalVersion: true
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "logstash"
+    source:
+      version: 2.1.0
+  - groupId: "io.jenkins.plugins.external-logging"
+    artifactId: "external-logging-api"
+    source:
+      version: 1.0-alpha-1-SNAPSHOT
+  - groupId: "io.jenkins.plugins.external-logging"
+    artifactId: "external-logging-elasticsearch"
+    source:
+      version: 1.0-alpha-1-SNAPSHOT
+
+  # Security warnings
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "junit"
+    source:
+      version: 1.24
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "mailer"
+    source:
+      version: 1.21
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "git-client"
+    source:
+      version: 2.7.2
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "credentials-binding"
+    source:
+      version: 1.16
+  - groupId: "org.jenkins-ci.plugins"
+    artifactId: "docker-commons"
+    source:
+      version: 1.13
+systemProperties: {
+    jenkins.model.Jenkins.slaveAgentPort: "9000",
+    jenkins.model.Jenkins.slaveAgentPortEnforce: "true"}
+groovyHooks:
+  - type: "init"
+    id: "initScripts"
+    source:
+      dir: src/main/groovy
diff --git a/demo/pom.xml b/demo/pom.xml
new file mode 100644
index 0000000..6b5b0d1
--- /dev/null
+++ b/demo/pom.xml
@@ -0,0 +1,88 @@
+
+
+  4.0.0
+
+  
+    org.jenkins-ci.plugins
+    plugin
+    3.15
+    
+  
+
+  io.jenkins.plugins.external-logging
+  external-logging-demo
+  External Logging for Elasticsearch/Logstash Demo
+  The plugin provides API to simplify external logging implementations for Jenkins
+  https://wiki.jenkins.io/display/JENKINS/External+Logging+API+Plugin
+  ${revision}${changelist}
+  hpi
+
+  
+    1.0-alpha-1
+    -SNAPSHOT
+    2.131-SNAPSHOT
+    8
+    true
+  
+  
+  
+    
+      MIT License
+      https://opensource.org/licenses/MIT
+    
+  
+
+  
+    scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git
+    scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git
+    https://github.com/jenkinsci/${project.artifactId}-plugin
+    ${scmTag}
+  
+
+  
+    
+      io.jenkins.plugins.external-logging
+      external-logging-elasticsearch
+      1.0-alpha-1-SNAPSHOT
+    
+  
+
+  
+    
+      
+        org.codehaus.gmaven
+        gmaven-plugin
+        1.5-jenkins-3
+        
+          
+            org.codehaus.gmaven.runtime
+            gmaven-runtime-1.8
+            1.5-jenkins-3
+          
+        
+        
+          
+            
+              compile
+              testCompile
+            
+          
+        
+      
+    
+  
+
+  
+    
+      repo.jenkins-ci.org
+      https://repo.jenkins-ci.org/public/
+    
+  
+  
+    
+      repo.jenkins-ci.org
+      https://repo.jenkins-ci.org/public/
+    
+  
+
+
diff --git a/demo/src/main/groovy/1_System.groovy b/demo/src/main/groovy/1_System.groovy
new file mode 100644
index 0000000..8132999
--- /dev/null
+++ b/demo/src/main/groovy/1_System.groovy
@@ -0,0 +1,68 @@
+import hudson.security.csrf.DefaultCrumbIssuer
+import hudson.model.*
+import hudson.security.FullControlOnceLoggedInAuthorizationStrategy
+import hudson.security.HudsonPrivateSecurityRealm
+import hudson.util.Secret
+import jenkins.model.Jenkins
+import jenkins.model.JenkinsLocationConfiguration
+import jenkins.CLI
+import jenkins.security.s2m.AdminWhitelistRule
+import org.kohsuke.stapler.StaplerProxy
+
+import com.cloudbees.plugins.credentials.CredentialsProvider
+import com.cloudbees.plugins.credentials.CredentialsScope
+import com.cloudbees.plugins.credentials.domains.Domain
+import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl
+
+//TODO: Migrate to JCasC once it supports disabling via system property
+
+if (!Boolean.getBoolean("io.jenkins.demo.external-task-logging-elk.enabled")) {
+    // Production mode, we do not configure the system
+    return
+}
+
+println("-- System configuration")
+
+println("--- Installing the Security Realm")
+def securityRealm = new HudsonPrivateSecurityRealm(false)
+User user = securityRealm.createAccount("user", "user")
+user.setFullName("User")
+User admin = securityRealm.createAccount("admin", "admin")
+admin.setFullName("Admin")
+Jenkins.instance.setSecurityRealm(securityRealm)
+
+println("---Installing the demo Authorization strategy")
+Jenkins.instance.authorizationStrategy = new FullControlOnceLoggedInAuthorizationStrategy()
+
+println("--- Configuring Remoting (JNLP4 only, no Remoting CLI)")
+CLI.get().enabled = false
+Jenkins.instance.agentProtocols = new HashSet(["JNLP4-connect"])
+Jenkins.instance.getExtensionList(StaplerProxy.class)
+    .get(AdminWhitelistRule.class)
+    .masterKillSwitch = false
+
+println("--- Checking the CSRF protection")
+if (Jenkins.instance.crumbIssuer == null) {
+    println "CSRF protection is disabled, Enabling the default Crumb Issuer"
+    Jenkins.instance.crumbIssuer = new DefaultCrumbIssuer(true)
+}
+
+println("--- Configuring Quiet Period")
+// We do not wait for anything, demo should be fast
+Jenkins.instance.quietPeriod = 0
+
+println("--- Configuring Email global settings")
+JenkinsLocationConfiguration.get().adminAddress = "admin@non.existent.email"
+// Mailer.descriptor().defaultSuffix = "@non.existent.email"
+
+println("--- Adding test credentials")
+def c = new StringCredentialsImpl(
+    CredentialsScope.GLOBAL,
+    "token",
+    "Test token",
+    Secret.fromString("SECRET_TOKEN_WHICH_SHOULD_NOD_BE_DISPLAYED")
+)
+
+CredentialsProvider.lookupStores(Jenkins.instance).each { it ->
+    it.addCredentials(Domain.global(), c)
+}
diff --git a/demo/src/main/groovy/2_Logstash.groovy b/demo/src/main/groovy/2_Logstash.groovy
new file mode 100644
index 0000000..280aaba
--- /dev/null
+++ b/demo/src/main/groovy/2_Logstash.groovy
@@ -0,0 +1,19 @@
+import jenkins.plugins.logstash.LogstashInstallation
+import jenkins.plugins.logstash.LogstashConfiguration
+import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
+
+println("--- Configuring Logstash")
+String logstashPort = System.getProperty("elasticsearch.port");
+
+def descriptor = LogstashInstallation.logstashDescriptor
+descriptor.@type = LogstashIndexerDao.IndexerType.ELASTICSEARCH
+descriptor.@host = System.getProperty("elasticsearch.host", "http://elk")
+descriptor.@port = logstashPort != null ? Integer.parseInt(logstashPort) : 9200
+descriptor.@username = System.getProperty("elasticsearch.username")
+descriptor.@password = System.getProperty("elasticsearch.password")
+descriptor.@key = System.getProperty("logstash.key", "/logstash/logs")
+
+// TODO: Replace by proper initialization once plugin API is fixed
+// Currently setIndexer() method does not change active indexer.
+LogstashConfiguration.instance.@dataMigrated = false
+LogstashConfiguration.instance.migrateData()
diff --git a/demo/src/main/groovy/3_Agent.groovy b/demo/src/main/groovy/3_Agent.groovy
new file mode 100644
index 0000000..ac20c95
--- /dev/null
+++ b/demo/src/main/groovy/3_Agent.groovy
@@ -0,0 +1,15 @@
+import hudson.slaves.DumbSlave;
+import hudson.slaves.JNLPLauncher;
+import jenkins.model.Jenkins;
+import jenkins.slaves.JnlpSlaveAgentProtocol;
+
+import javax.crypto.spec.SecretKeySpec;
+
+println("-- Configuring the agent")
+
+// Hardcode secret so that Docker Compose can connect agents
+JnlpSlaveAgentProtocol.SLAVE_SECRET.@key = new SecretKeySpec(new byte[10], "HmacSHA256");
+
+// Register the agent
+def node = new DumbSlave("agent", "/home/jenkins", new JNLPLauncher(true));
+Jenkins.instance.addNode(node);
diff --git a/demo/src/main/groovy/4_Jobs.groovy b/demo/src/main/groovy/4_Jobs.groovy
new file mode 100644
index 0000000..d0cc7e2
--- /dev/null
+++ b/demo/src/main/groovy/4_Jobs.groovy
@@ -0,0 +1,56 @@
+//TODO: Migrate to JCasC once it supports disabling via system property
+import jenkins.model.Jenkins
+import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition
+import org.jenkinsci.plugins.workflow.job.WorkflowJob
+
+if (!Boolean.getBoolean("io.jenkins.demo.external-task-logging-elk.enabled")) {
+    // Production mode, we do not configure the system
+    return
+}
+
+println("-- Creating Jobs")
+//TODO: Classes do not work here, so some copy-paste for now
+
+if(Jenkins.instance.getItem("Demo_master") == null) {
+    WorkflowJob project1 = Jenkins.instance.createProject(WorkflowJob.class, "Demo_master")
+    project1.definition = new CpsFlowDefinition(
+        "node('master') {\n" +
+        "  sh \"ping -c 20 google.com\"\n" +
+        "}",
+        true // Sandbox
+    )
+    project1.save()
+}
+
+if(Jenkins.instance.getItem("Demo_agent") == null) {
+    WorkflowJob project2 = Jenkins.instance.createProject(WorkflowJob.class, "Demo_agent")
+    project2.definition = new CpsFlowDefinition(
+        "node('agent') {\n" +
+        "  sh \"echo Hello, world!\"\n" +
+            // TODO Current demo image does not have ping, ORLY (alpine)
+            //    "  sh \"ping -c 20 google.com\"\n" +
+        "}",
+        true // Sandbox
+    )
+    project2.save()
+}
+
+if(Jenkins.instance.getItem("Demo_parallel") == null) {
+    WorkflowJob project3 = Jenkins.instance.createProject(WorkflowJob.class, "Demo_parallel")
+    project3.definition = new CpsFlowDefinition(
+        "parallel local: {\n" +
+        "  node('master') {\n" +
+        "    sh 'for x in 0 1 2 3 4 5 6 7 8 9; do echo \$x; sleep 1; done'\n" +
+        "  }\n" +
+        "}, remote: {\n" +
+        "  node('agent') {\n" +
+        "    withCredentials([string(credentialsId: 'token', variable: 'TOKEN')]) {\n" +
+        "      sh 'echo receiving \$TOKEN'\n" +
+        "      sh 'for x in 0 1 2 3 4 5 6 7 8 9; do echo \$x; sleep 1; done'\n" +
+        "    }\n" +
+        "  }\n" +
+        "}",
+        true // Sandbox
+    )
+    project3.save()
+}
diff --git a/demo/src/main/groovy/5_SaveToDisk.groovy b/demo/src/main/groovy/5_SaveToDisk.groovy
new file mode 100644
index 0000000..0b18d6f
--- /dev/null
+++ b/demo/src/main/groovy/5_SaveToDisk.groovy
@@ -0,0 +1,3 @@
+import jenkins.model.Jenkins
+
+Jenkins.instance.save()
diff --git a/demo/src/main/java/Stub.java b/demo/src/main/java/Stub.java
new file mode 100644
index 0000000..80dfe86
--- /dev/null
+++ b/demo/src/main/java/Stub.java
@@ -0,0 +1,6 @@
+public class Stub {
+    // Nothing, just to make the compiler happy
+    public void foo() {
+        
+    }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 78d9952..46de73b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
   
     external-logging-api
     external-logging-elasticsearch
+    
   
   
   

From 0d92ffd87b2420441135da7df812f3adf43d74e8 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 9 Jul 2018 19:20:39 +0200
Subject: [PATCH 06/23] Add support of debugging Jenkins from the demo +
 self-configuration of External logging

---
 demo/Makefile                                    |  8 +++++---
 demo/docker-compose.yml                          | 16 ++++++++++++++++
 demo/packager-config.yml                         |  2 +-
 .../{2_Logstash.groovy => 2_ExtLogging.groovy}   |  7 +++++++
 4 files changed, 29 insertions(+), 4 deletions(-)
 rename demo/src/main/groovy/{2_Logstash.groovy => 2_ExtLogging.groovy} (68%)

diff --git a/demo/Makefile b/demo/Makefile
index 48ca030..27b6e2a 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -13,7 +13,7 @@ clean:
 
 build: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
 
-tmp/cwp-cli.jar:
+tmp/output/target/${ARTIFACT_ID}-${VERSION}.war:
 	mvn com.googlecode.maven-download-plugin:download-maven-plugin:1.4.0:artifact \
 		-DgroupId=io.jenkins.tools.custom-war-packager \
 		-DartifactId=custom-war-packager-cli \
@@ -21,11 +21,13 @@ tmp/cwp-cli.jar:
 		-Dversion=${CWP_VERSION} \
 		-DoutputDirectory=tmp \
 		-DoutputFileName=cwp-cli.jar
-
-tmp/output/target/${ARTIFACT_ID}-${VERSION}.war: tmp/cwp-cli.jar
 	java -jar tmp/cwp-cli.jar \
 	    -configPath packager-config.yml -version ${VERSION}
 
 run: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
 	docker-compose rm -fv
 	docker-compose up --build --force-recreate jenkins elk
+
+debug: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
+	docker-compose rm -fv
+	docker-compose up --build --force-recreate jenkinsDebug elk
diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index 3ba37a4..7edb6fd 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -25,6 +25,22 @@ services:
     expose:
       - "8080"
       - "9000"
+  jenkinsDebug:
+    image: jenkins/demo-external-task-logging-elk:latest
+    container_name: jenkins
+    links:
+      - elk
+    environment:
+      - JAVA_OPTS=-Dio.jenkins.demo.external-task-logging-elk.enabled=true -Djenkins.install.runSetupWizard=false
+      - DEBUG=true
+    ports:
+      - "8080:8080"
+      - "9000:9000"
+      - "5005:5005"
+    expose:
+      - "8080"
+      - "9000"
+      - "5005"
   agent:
     image: cloudbees/jnlp-slave-with-java-build-tools:2.2.0
     links:
diff --git a/demo/packager-config.yml b/demo/packager-config.yml
index 5f9f7ae..5bd9ec4 100644
--- a/demo/packager-config.yml
+++ b/demo/packager-config.yml
@@ -6,7 +6,7 @@ bundle:
   description: "Jenkins External Task Logging demo for Elasticsearch, packaged as a single WAR file. It automatically configures logging on startup"
 buildSettings:
   docker:
-    base: "jenkins/jenkins:2.121.1"
+    base: "jenkins/jenkins:2.130"
     tag: "jenkins/demo-external-task-logging-elk"
     build: true
 war:
diff --git a/demo/src/main/groovy/2_Logstash.groovy b/demo/src/main/groovy/2_ExtLogging.groovy
similarity index 68%
rename from demo/src/main/groovy/2_Logstash.groovy
rename to demo/src/main/groovy/2_ExtLogging.groovy
index 280aaba..4c42dae 100644
--- a/demo/src/main/groovy/2_Logstash.groovy
+++ b/demo/src/main/groovy/2_ExtLogging.groovy
@@ -1,6 +1,9 @@
 import jenkins.plugins.logstash.LogstashInstallation
 import jenkins.plugins.logstash.LogstashConfiguration
 import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration
+import io.jenkins.plugins.extlogging.logstash.LogstashDaoLoggingMethod
+import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowser
 
 println("--- Configuring Logstash")
 String logstashPort = System.getProperty("elasticsearch.port");
@@ -17,3 +20,7 @@ descriptor.@key = System.getProperty("logstash.key", "/logstash/logs")
 // Currently setIndexer() method does not change active indexer.
 LogstashConfiguration.instance.@dataMigrated = false
 LogstashConfiguration.instance.migrateData()
+
+println("--- Configuring External Logging")
+ExternalLoggingGlobalConfiguration.instance.loggingMethod = new LogstashDaoLoggingMethod()
+ExternalLoggingGlobalConfiguration.instance.logBrowser = new ElasticsearchLogBrowser()

From 56759dcbb1ec0459665d9e45838cb0faff1bd177 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 9 Jul 2018 20:00:39 +0200
Subject: [PATCH 07/23] Route Pipeline logs through the ExternalLogBrowser
 implementation, Logstash is working

---
 .../extlogging/api/ExternalLogBrowser.java    | 23 ++++++++++
 .../ExternalLoggingGlobalConfiguration.java   |  2 +-
 .../impl/ExternalLoggingMethodLocator.java    |  3 +-
 .../pipeline/ExternalPipelineLogStorage.java  | 38 +++++++----------
 .../ExternalPipelineLogStorageFactory.java    | 13 ++++--
 .../extlogging/api/FreestyleJobTest.java      |  3 +-
 .../extlogging/api/PipelineSmokeTest.java     |  5 +--
 .../ElasticsearchLogBrowser.java              | 23 +++++++++-
 ...=> ElasticsearchLogLargeTextProvider.java} | 42 +++++++++----------
 .../logstash/LogstashDaoLoggingMethod.java    |  8 +++-
 .../logstash/RemoteLogstashWriter.java        |  9 +++-
 11 files changed, 106 insertions(+), 63 deletions(-)
 create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
 rename external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/{ElasticsearchLogAction.java => ElasticsearchLogLargeTextProvider.java} (93%)

diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
new file mode 100644
index 0000000..eb7f821
--- /dev/null
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
@@ -0,0 +1,23 @@
+package io.jenkins.plugins.extlogging.api;
+
+import hudson.console.AnnotatedLargeText;
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
+import jenkins.model.logging.LogBrowser;
+import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
+import org.jenkinsci.plugins.workflow.graph.FlowNode;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public abstract class ExternalLogBrowser extends LogBrowser {
+
+    public abstract AnnotatedLargeText overallLog(@Nonnull Run run, boolean b);
+
+    public abstract AnnotatedLargeText stepLog(@Nonnull Run run, @CheckForNull String stepId, boolean b);
+}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
index c777635..e39ad1c 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
@@ -25,7 +25,7 @@ public class ExternalLoggingGlobalConfiguration extends GlobalConfiguration {
     private LogBrowser logBrowser;
 
     @Nonnull
-    public static ExternalLoggingGlobalConfiguration get() {
+    public static ExternalLoggingGlobalConfiguration getInstance() {
         ExternalLoggingGlobalConfiguration cfg = GlobalConfiguration.all().get(ExternalLoggingGlobalConfiguration.class);
         return cfg != null ? cfg : DEFAULT;
     }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
index 1278707..182e41b 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
@@ -2,7 +2,6 @@
 
 import hudson.Extension;
 import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import jenkins.model.logging.LoggingMethod;
 import jenkins.model.logging.LoggingMethodLocator;
 
@@ -18,7 +17,7 @@ public class ExternalLoggingMethodLocator extends LoggingMethodLocator {
     @CheckForNull
     @Override
     protected LoggingMethod getLoggingMethod(Run run) {
-        return ExternalLoggingGlobalConfiguration.get().getLoggingMethod();
+        return ExternalLoggingGlobalConfiguration.getInstance().getLoggingMethod();
     }
 
 }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
index b0df7de..1b96540 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
@@ -28,10 +28,13 @@
 import hudson.console.AnnotatedLargeText;
 import hudson.model.BuildListener;
 import hudson.model.TaskListener;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowser;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.api.SensitiveStringsProvider;
+import io.jenkins.plugins.extlogging.api.util.UniqueIdHelper;
 import jenkins.model.logging.LoggingMethod;
 import jenkins.model.logging.LoggingMethodLocator;
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
@@ -51,49 +54,38 @@
 public class ExternalPipelineLogStorage implements LogStorage {
 
     private final ExternalLoggingMethod lm;
+    private final ExternalLogBrowser logBrowser;
     private final WorkflowRun run;
 
-    ExternalPipelineLogStorage(@Nonnull WorkflowRun run, @Nonnull ExternalLoggingMethod lm) {
+    ExternalPipelineLogStorage(@Nonnull WorkflowRun run, @Nonnull ExternalLoggingMethod lm, @Nonnull ExternalLogBrowser browser) {
         this.run = run;
         this.lm = lm;
+        this.logBrowser = browser;
     }
 
     @Nonnull
     @Override
     public BuildListener overallListener() throws IOException, InterruptedException {
-        final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run);
-        if (loggingMethod instanceof ExternalLoggingMethod) {
-            ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod;
-            return new PipelineListener(run, lm);
-        }
-
-        // Else - not configured
-        return null;
+        return new PipelineListener(run, lm);
     }
 
     @Nonnull
     @Override
     public TaskListener nodeListener(@Nonnull FlowNode flowNode) throws IOException, InterruptedException {
-        final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run);
-        if (loggingMethod instanceof ExternalLoggingMethod) {
-            ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod;
-            return new PipelineListener(run, flowNode, lm);
-        }
-
-        // Else - not configured
-        return null;
+        return new PipelineListener(run, flowNode, lm);
     }
 
     @Nonnull
     @Override
     public AnnotatedLargeText overallLog(@Nonnull FlowExecutionOwner.Executable executable, boolean b) {
-        return null;
+        //TODO: Handle executable? Why is it needed at all?
+        return logBrowser.overallLog((WorkflowRun)executable, b);
     }
 
     @Nonnull
     @Override
     public AnnotatedLargeText stepLog(@Nonnull FlowNode flowNode, boolean b) {
-        return null;
+        return logBrowser.stepLog(run, flowNode.getId(), b);
     }
 
 
@@ -108,16 +100,16 @@ private static class PipelineListener implements BuildListener {
         PipelineListener(WorkflowRun run, ExternalLoggingMethod method) {
             this.writer = method.createWriter(run);
             this.sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings(run);
-
-
+            writer.addMetadataEntry("jobId", UniqueIdHelper.getOrCreateId(run.getParent()));
         }
 
         PipelineListener(WorkflowRun run, FlowNode node, ExternalLoggingMethod method) {
             this(run, method);
-            writer.addMetadataEntry("flowNodeId", node.getId());
+            writer.addMetadataEntry("stepId", node.getId());
         }
 
-        @Override public PrintStream getLogger() {
+        @Override
+        public PrintStream getLogger() {
             if (logger == null) {
                 logger = new PrintStream(ExternalLoggingOutputStream.createOutputStream(writer, sensitiveStrings));
             }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
index 36a8307..7c0dfcf 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
@@ -4,8 +4,11 @@
 import hudson.model.Queue;
 import hudson.model.Run;
 import hudson.model.queue.SubTask;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowser;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import io.jenkins.plugins.extlogging.api.integrations.MaskPasswordsSensitiveStringsProvider.MaskSensitiveStringsProvider;
+import jenkins.model.GlobalConfiguration;
+import jenkins.model.logging.LogBrowser;
 import jenkins.model.logging.LoggingMethod;
 import jenkins.model.logging.LoggingMethodLocator;
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
@@ -34,9 +37,8 @@ public LogStorage forBuild(@Nonnull FlowExecutionOwner flowExecutionOwner) {
         final WorkflowRun run;
         try {
             final Queue.Executable executable = flowExecutionOwner.getExecutable();
-            final SubTask task = executable.getParent();
-            if (task instanceof Run) {
-                Run r = (Run)task;
+            if (executable instanceof Run) {
+                Run r = (Run)executable;
                 if (r instanceof WorkflowRun) {
                     run = (WorkflowRun) r;
                 } else {
@@ -53,7 +55,10 @@ public LogStorage forBuild(@Nonnull FlowExecutionOwner flowExecutionOwner) {
         final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run);
         if (loggingMethod instanceof ExternalLoggingMethod) {
             ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod;
-            return new ExternalPipelineLogStorage(run, lm);
+
+            // TODO: Support configuration, type check
+            LogBrowser browser = lm.getDefaulLogBrowser();
+            return new ExternalPipelineLogStorage(run, lm, (ExternalLogBrowser) browser);
         }
 
         return null;
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
index 432dfba..faf8afc 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
@@ -7,7 +7,6 @@
 import io.jenkins.plugins.extlogging.api.util.MockExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.util.MockLogBrowser;
 import io.jenkins.plugins.extlogging.api.util.MockLoggingMethod;
-import jenkins.model.GlobalConfiguration;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -31,7 +30,7 @@ public class FreestyleJobTest {
 
     @Before
     public void setup() throws Exception {
-        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.get();
+        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
         loggingMethod = new MockLoggingMethod(tmpDir.newFolder("logs"));
         cfg.setLoggingMethod(loggingMethod);
         cfg.setLogBrowser(new MockLogBrowser());
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
index 1a28a22..9a36176 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
@@ -1,9 +1,6 @@
 package io.jenkins.plugins.extlogging.api;
 
-import hudson.model.FreeStyleBuild;
-import hudson.model.FreeStyleProject;
 import hudson.model.Run;
-import hudson.tasks.Shell;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
 import io.jenkins.plugins.extlogging.api.util.MockExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.util.MockLogBrowser;
@@ -33,7 +30,7 @@ public class PipelineSmokeTest {
 
     @Before
     public void setup() throws Exception {
-        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.get();
+        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
         loggingMethod = new MockLoggingMethod(tmpDir.newFolder("logs"));
         cfg.setLoggingMethod(loggingMethod);
         cfg.setLogBrowser(new MockLogBrowser());
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
index e18aff6..8de73cb 100644
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
@@ -1,10 +1,29 @@
 package io.jenkins.plugins.extlogging.elasticsearch;
 
-import jenkins.model.logging.LogBrowser;
+import hudson.console.AnnotatedLargeText;
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowser;
+import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
+import org.jenkinsci.plugins.workflow.graph.FlowNode;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author Oleg Nenashev
  * @since TODO
  */
-public class ElasticsearchLogBrowser extends LogBrowser {
+public class ElasticsearchLogBrowser extends ExternalLogBrowser {
+
+    //TODO: Cache values instead of refreshing them each time
+    @Override
+    public AnnotatedLargeText overallLog(@Nonnull Run run, boolean b) {
+        return new ElasticsearchLogLargeTextProvider(run, null).getLogText();
+    }
+
+    @Override
+    public AnnotatedLargeText stepLog(@Nonnull Run run, @CheckForNull String stepId, boolean b) {
+        return new ElasticsearchLogLargeTextProvider(run, stepId).getLogText();
+    }
 }
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogLargeTextProvider.java
similarity index 93%
rename from external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction.java
rename to external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogLargeTextProvider.java
index 833bca1..e0749ca 100644
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction.java
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogLargeTextProvider.java
@@ -19,11 +19,11 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
 
-import io.jenkins.plugins.extlogging.api.util.AbstractConsoleAction;
 import io.jenkins.plugins.extlogging.api.util.UniqueIdHelper;
 import io.jenkins.plugins.extlogging.elasticsearch.util.HttpGetWithData;
 import jenkins.model.Jenkins;
@@ -52,29 +52,24 @@
  * @author Oleg Nenashev
  */
 @Restricted(NoExternalUse.class)
-public class ElasticsearchLogAction extends AbstractConsoleAction {
-    
-    public ElasticsearchLogAction(Run run) {
-        super(run);
-    }
+public class ElasticsearchLogLargeTextProvider {
 
-    private transient HttpClientBuilder clientBuilder;
-    
-    @Override
-    public String getIconFileName() {
-        return "terminal.png";
-    }
+    @Nonnull
+    private Run run;
 
-    @Override
-    public String getUrlName() {
-        return "externalLog";
-    } 
+    @CheckForNull
+    private String stepId;
 
-    @Override
-    public String getDataSourceDisplayName() {
-        return "Elasticsearch";
+    public ElasticsearchLogLargeTextProvider(Run run) {
+        this(run, null);
     }
 
+    public ElasticsearchLogLargeTextProvider(Run run, String stepId) {
+        this.run = run;
+    }
+
+    private transient HttpClientBuilder clientBuilder;
+
     /**
      * Used from index.jelly to write annotated log to the given
      * output.
@@ -108,7 +103,7 @@ public void writeLogTo(long offset, @Nonnull XMLOutput out) throws IOException {
         } catch (IOException ex) {
             buf = new ByteBuffer();
         }
-        return new UncompressedAnnotatedLargeText(buf, StandardCharsets.UTF_8, !isLogUpdated(), this);
+        return new UncompressedAnnotatedLargeText(buf, StandardCharsets.UTF_8, !run.isLogUpdated(), this);
     }
     
     /**
@@ -124,7 +119,7 @@ public ByteBuffer readLogToBuffer(long initialOffset) throws IOException {
         ElasticSearchDao esDao = (ElasticSearchDao)dao;
         
         ByteBuffer buffer = new ByteBuffer();
-        Collection pulledLogs = pullLogs(getRun(), esDao,0, Long.MAX_VALUE);
+        Collection pulledLogs = pullLogs(esDao,0, Long.MAX_VALUE);
         long ctr = 0;
         for (String logEntry : pulledLogs) {
             byte[] bytes = logEntry.getBytes();
@@ -136,7 +131,7 @@ public ByteBuffer readLogToBuffer(long initialOffset) throws IOException {
         return buffer;
     }
 
-    private Collection pullLogs(Run run, ElasticSearchDao dao, long sinceMs, long toMs) throws IOException {
+    private Collection pullLogs(ElasticSearchDao dao, long sinceMs, long toMs) throws IOException {
         CloseableHttpClient httpClient = null;
         CloseableHttpResponse response = null;
 
@@ -151,6 +146,9 @@ private Collection pullLogs(Run run, ElasticSearchDao dao, long sinceMs,
                 "    \"bool\": { \n" +
                 "      \"must\": [\n" +
                 "        { \"match\": { \"data.jobId\":   \"" + jobId + "\"}}, \n" +
+                (stepId != null ?
+                "        { \"match\": { \"data.stepId\": \"" + stepId + "\" }},  \n"
+                : "") +
                 "        { \"match\": { \"data.buildNum\": \"" + run.getNumber() + "\" }}  \n" +
                 "      ]\n" +
                 "    }\n" +
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
index 27f4a23..0b82b82 100644
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
@@ -8,8 +8,10 @@
 import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
+import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowser;
 import jenkins.model.logging.LogBrowser;
 import jenkins.plugins.logstash.LogstashConfiguration;
+import jenkins.plugins.logstash.persistence.ElasticSearchDao;
 import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
 
 import javax.annotation.CheckForNull;
@@ -26,6 +28,10 @@ public class LogstashDaoLoggingMethod extends ExternalLoggingMethod {
     @CheckForNull
     @Override
     public LogBrowser getDefaulLogBrowser() {
+        LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance();
+        if (dao instanceof ElasticSearchDao) {
+            return new ElasticsearchLogBrowser();
+        }
         return null;
     }
 
@@ -44,8 +50,6 @@ public OutputStream decorateLogger(Run run, OutputStream logger) {
         return null;
     }
 
-
-
     private static class LogstashOutputStreamWrapper implements OutputStreamWrapper {
 
         private final RemoteLogstashWriter wr;
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
index ecc052d..58d076d 100644
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
@@ -14,6 +14,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -44,7 +45,13 @@ public void writeMessage(String message) throws IOException {
     public void writeEvent(Event event) {
         JSONObject payload = dao.buildPayload(buildData, jenkinsUrl,
                 Collections.singletonList(event.getMessage()));
-        // TODO: append custom data passed in the event
+        // TODO: replace Dao implementation by an independent one
+        JSONObject data = payload.getJSONObject("data");
+        for (Map.Entry entry : event.getData().entrySet()) {
+            Object value = entry.getValue();
+            data.put(entry.getKey(), value != null ? value.toString() : null);
+        }
+
         try {
             dao.push(payload.toString());
         } catch (IOException e) {

From a650819964eaccb70580b09b4c1347fcd971440a Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 16 Jul 2018 11:21:57 +0300
Subject: [PATCH 08/23] Implement new API from the Jenkins Core

---
 .../jenkins/plugins/extlogging/api/Event.java |  4 ++
 .../extlogging/api/ExternalLogBrowser.java    | 23 --------
 .../api/ExternalLogBrowserFactory.java        | 27 ++++++++++
 .../ExternalLogBrowserFactoryDescriptor.java  | 13 +++++
 .../extlogging/api/ExternalLoggingMethod.java | 54 ++++++++++++-------
 .../api/ExternalLoggingMethodFactory.java     | 26 +++++++++
 ...xternalLoggingMethodFactoryDescriptor.java | 13 +++++
 .../ExternalLoggingEventWriter.java           |  6 ++-
 .../ExternalLoggingGlobalConfiguration.java   | 21 ++++----
 .../impl/ExternalLoggingMethodLocator.java    | 22 ++++++--
 .../api/impl/ExternalLoggingOutputStream.java |  1 -
 ...ggingThroughMasterOutputStreamWrapper.java |  5 --
 .../pipeline/ExternalPipelineLogStorage.java  | 21 ++++----
 .../ExternalPipelineLogStorageFactory.java    | 17 +++---
 .../extlogging/api/FreestyleJobTest.java      | 17 +++---
 .../extlogging/api/PipelineSmokeTest.java     | 17 ++++--
 .../util/MockExternalLoggingEventWriter.java  |  2 +-
 .../extlogging/api/util/MockLogBrowser.java   | 27 +++++++---
 .../api/util/MockLogBrowserFactory.java       | 26 +++++++++
 .../api/util/MockLoggingMethod.java           | 34 ++++++------
 .../api/util/MockLoggingMethodFactory.java    | 29 ++++++++++
 .../ElasticsearchLogBrowser.java              | 25 +++++----
 .../ElasticsearchLogBrowserFactory.java       | 40 ++++++++++++++
 .../logstash/LogstashDaoLoggingMethod.java    | 33 +++++++-----
 .../LogstashDaoLoggingMethodFactory.java      | 48 +++++++++++++++++
 .../logstash/RemoteLogstashWriter.java        | 12 +++--
 26 files changed, 417 insertions(+), 146 deletions(-)
 delete mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
 create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java
 create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java
 create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java
 create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java
 rename external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/{ => impl}/ExternalLoggingEventWriter.java (78%)
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java
 create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java
 create mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java

diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
index d15ee80..4101314 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
@@ -41,6 +41,10 @@ public String toString() {
         return String.format("[%d] - %s", timestamp, message);
     }
 
+    public void setData(Map data) {
+        this.data = data;
+    }
+
     public String toStringWithData() {
         return String.format("[%d] - %s: %s", timestamp, message, data);
     }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
deleted file mode 100644
index eb7f821..0000000
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.jenkins.plugins.extlogging.api;
-
-import hudson.console.AnnotatedLargeText;
-import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
-import jenkins.model.logging.LogBrowser;
-import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
-import org.jenkinsci.plugins.workflow.graph.FlowNode;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
-/**
- * @author Oleg Nenashev
- * @since TODO
- */
-public abstract class ExternalLogBrowser extends LogBrowser {
-
-    public abstract AnnotatedLargeText overallLog(@Nonnull Run run, boolean b);
-
-    public abstract AnnotatedLargeText stepLog(@Nonnull Run run, @CheckForNull String stepId, boolean b);
-}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java
new file mode 100644
index 0000000..6ded090
--- /dev/null
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java
@@ -0,0 +1,27 @@
+package io.jenkins.plugins.extlogging.api;
+
+import hudson.ExtensionPoint;
+import hudson.model.Describable;
+import hudson.model.Descriptor;
+import jenkins.model.Jenkins;
+import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.Loggable;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public abstract class ExternalLogBrowserFactory
+        implements Describable, ExtensionPoint {
+
+    @CheckForNull
+    public abstract LogBrowser create(Loggable loggable);
+
+    @Override
+    public Descriptor getDescriptor() {
+        return Jenkins.get().getDescriptor(getClass());
+    }
+
+}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java
new file mode 100644
index 0000000..9c6be61
--- /dev/null
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java
@@ -0,0 +1,13 @@
+package io.jenkins.plugins.extlogging.api;
+
+import hudson.model.Descriptor;
+
+/**
+ * Descriptor for {@link ExternalLogBrowserFactory}
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class ExternalLogBrowserFactoryDescriptor
+        extends Descriptor {
+
+}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index 639e250..951ed76 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -4,14 +4,18 @@
 import hudson.model.Run;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Collections;
 import java.util.List;
 
 import hudson.model.TaskListener;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.api.impl.LoggingThroughMasterOutputStreamWrapper;
+import jenkins.model.logging.Loggable;
 import jenkins.model.logging.LoggingMethod;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 /**
  * Implements External logging method and simplifies API.
@@ -20,8 +24,19 @@
  */
 public abstract class ExternalLoggingMethod extends LoggingMethod {
 
+    public ExternalLoggingMethod(@Nonnull Loggable loggable) {
+        super(loggable);
+    }
+
+    //TODO: imple
+    @CheckForNull
+    @Override
+    public TaskListener createTaskListener() {
+        return null;
+    }
+
     @Override
-    public ConsoleLogFilter createLoggerDecorator(Run run) {
+    public ConsoleLogFilter createLoggerDecorator() {
         return new ConsoleLogFilter() {
             @Override
             public OutputStream decorateLogger(Run run, OutputStream logger) throws IOException, InterruptedException {
@@ -30,42 +45,41 @@ public OutputStream decorateLogger(Run run, OutputStream logger) throws IOExcept
         };
     }
 
-    public final OutputStream createOutputStream(Run run) {
-        final ExternalLoggingEventWriter writer = createWriter(run);
-        final List sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings(run);
+    private final OutputStream createOutputStream() {
+        final ExternalLoggingEventWriter writer = createWriter();
+
+        final List sensitiveStrings;
+        if (getOwner() instanceof Run) {
+            sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings((Run)getOwner());
+        } else {
+            sensitiveStrings = Collections.emptyList();
+        }
         return ExternalLoggingOutputStream.createOutputStream(writer, sensitiveStrings);
     }
 
     /**
      * Creates Remotable wrapper.
      * By default, logging happens through master unless there is a custom implementation.
-     * @param run Run
      * @return Remotable wrapper
      */
-    public OutputStreamWrapper createWrapper(Run run) {
-        //TODO: capture agent in API to allow overrides with checks
-        return new LoggingThroughMasterOutputStreamWrapper(createOutputStream(run));
-    }
-
     @CheckForNull
-    @Override
-    public TaskListener createTaskListener(Run run) {
-        //TODO: task listener implementation
-        return null;
+    public OutputStreamWrapper createWrapper() {
+        //TODO: capture agent in API to allow overrides with checks
+        return new LoggingThroughMasterOutputStreamWrapper(createOutputStream());
     }
 
-    public abstract ExternalLoggingEventWriter createWriter(Run run);
+    public abstract ExternalLoggingEventWriter createWriter();
 
-    public abstract OutputStream decorateLogger(Run run, OutputStream logger);
+    public abstract OutputStream decorateLogger(OutputStream logger);
 
     @Override
-    public OutputStreamWrapper provideOutStream(Run run) {
-        return createWrapper(run);
+    public OutputStreamWrapper provideRemotableOutStream() {
+        return createWrapper();
     }
 
     @Override
-    public OutputStreamWrapper provideErrStream(Run run) {
-        return createWrapper(run);
+    public OutputStreamWrapper provideRemotableErrStream() {
+        return createWrapper();
     }
 
 }
\ No newline at end of file
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java
new file mode 100644
index 0000000..7241fcc
--- /dev/null
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java
@@ -0,0 +1,26 @@
+package io.jenkins.plugins.extlogging.api;
+
+import hudson.ExtensionPoint;
+import hudson.model.Describable;
+import hudson.model.Descriptor;
+import jenkins.model.Jenkins;
+import jenkins.model.logging.Loggable;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public abstract class ExternalLoggingMethodFactory
+        implements Describable, ExtensionPoint {
+
+    @CheckForNull
+    public abstract ExternalLoggingMethod create(Loggable loggable);
+
+    @Override
+    public Descriptor getDescriptor() {
+        return Jenkins.get().getDescriptor(getClass());
+    }
+
+}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java
new file mode 100644
index 0000000..3527acf
--- /dev/null
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java
@@ -0,0 +1,13 @@
+package io.jenkins.plugins.extlogging.api;
+
+import hudson.model.Descriptor;
+
+/**
+ * Descriptor for {@link ExternalLoggingMethodFactory}
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class ExternalLoggingMethodFactoryDescriptor
+        extends Descriptor {
+
+}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
similarity index 78%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java
rename to external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
index 5d20caa..bd7b43b 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
@@ -1,4 +1,6 @@
-package io.jenkins.plugins.extlogging.api;
+package io.jenkins.plugins.extlogging.api.impl;
+
+import io.jenkins.plugins.extlogging.api.Event;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -18,7 +20,7 @@ public abstract class ExternalLoggingEventWriter extends Writer implements Seria
 
     public void writeMessage(String message) throws IOException {
         Event event = new Event(message);
-        event.data = metadata; // We do not copy the entry to save performance, custom implementations may need better logic
+        event.setData(metadata); // We do not copy the entry to save performance, custom implementations may need better logic
         writeEvent(event);
     }
 
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
index e39ad1c..15700e6 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
@@ -1,14 +1,15 @@
 package io.jenkins.plugins.extlogging.api.impl;
 
 import hudson.Extension;
-import jdk.nashorn.internal.objects.Global;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactory;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactory;
 import jenkins.model.GlobalConfiguration;
-import jenkins.model.logging.LogBrowser;
-import jenkins.model.logging.LoggingMethod;
+import org.kohsuke.stapler.DataBoundSetter;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
+//TODO: support global configuration
 /**
  * @author Oleg Nenashev
  * @since TODO
@@ -19,10 +20,10 @@ public class ExternalLoggingGlobalConfiguration extends GlobalConfiguration {
     private static final ExternalLoggingGlobalConfiguration DEFAULT = new DefaultExternalLoggingGlobalConfiguration();
 
     @CheckForNull
-    private LoggingMethod loggingMethod;
+    private ExternalLoggingMethodFactory loggingMethod;
 
     @CheckForNull
-    private LogBrowser logBrowser;
+    private ExternalLogBrowserFactory logBrowser;
 
     @Nonnull
     public static ExternalLoggingGlobalConfiguration getInstance() {
@@ -34,23 +35,25 @@ public ExternalLoggingGlobalConfiguration() {
         load();
     }
 
-    public void setLogBrowser(@CheckForNull LogBrowser logBrowser) {
+    @DataBoundSetter
+    public void setLogBrowser(@CheckForNull ExternalLogBrowserFactory logBrowser) {
         this.logBrowser = logBrowser;
         this.save();
     }
 
-    public void setLoggingMethod(@CheckForNull LoggingMethod loggingMethod) {
+    @DataBoundSetter
+    public void setLoggingMethod(@CheckForNull ExternalLoggingMethodFactory loggingMethod) {
         this.loggingMethod = loggingMethod;
         this.save();
     }
 
     @CheckForNull
-    public LogBrowser getLogBrowser() {
+    public ExternalLogBrowserFactory getLogBrowser() {
         return logBrowser;
     }
 
     @CheckForNull
-    public LoggingMethod getLoggingMethod() {
+    public ExternalLoggingMethodFactory getLoggingMethod() {
         return loggingMethod;
     }
 
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
index 182e41b..db6f3e3 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
@@ -1,7 +1,10 @@
 package io.jenkins.plugins.extlogging.api.impl;
 
 import hudson.Extension;
-import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactory;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactory;
+import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.Loggable;
 import jenkins.model.logging.LoggingMethod;
 import jenkins.model.logging.LoggingMethodLocator;
 
@@ -16,8 +19,21 @@ public class ExternalLoggingMethodLocator extends LoggingMethodLocator {
 
     @CheckForNull
     @Override
-    protected LoggingMethod getLoggingMethod(Run run) {
-        return ExternalLoggingGlobalConfiguration.getInstance().getLoggingMethod();
+    protected LoggingMethod getLoggingMethod(Loggable loggable) {
+        ExternalLoggingMethodFactory factory = ExternalLoggingGlobalConfiguration.getInstance().getLoggingMethod();
+        if (factory != null) {
+            return factory.create(loggable);
+        }
+        return null;
     }
 
+    @CheckForNull
+    @Override
+    protected LogBrowser getLogBrowser(Loggable loggable) {
+        ExternalLogBrowserFactory factory = ExternalLoggingGlobalConfiguration.getInstance().getLogBrowser();
+        if (factory != null) {
+            return factory.create(loggable);
+        }
+        return null;
+    }
 }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
index 07f451a..a8db72f 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
@@ -1,7 +1,6 @@
 package io.jenkins.plugins.extlogging.api.impl;
 
 import hudson.console.LineTransformationOutputStream;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.util.MaskSecretsOutputStream;
 
 import java.io.IOException;
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
index 703f900..8a4d1e0 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
@@ -17,11 +17,6 @@ public LoggingThroughMasterOutputStreamWrapper(OutputStream stream) {
         this.ostream = stream;
     }
 
-    @Override
-    public OutputStream toRawOutputStream() {
-        return ostream;
-    }
-
     @Override
     public OutputStream toSerializableOutputStream() {
         return new RemoteOutputStream(ostream);
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
index 1b96540..90fd9fe 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
@@ -28,15 +28,12 @@
 import hudson.console.AnnotatedLargeText;
 import hudson.model.BuildListener;
 import hudson.model.TaskListener;
-import io.jenkins.plugins.extlogging.api.ExternalLogBrowser;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.api.SensitiveStringsProvider;
 import io.jenkins.plugins.extlogging.api.util.UniqueIdHelper;
-import jenkins.model.logging.LoggingMethod;
-import jenkins.model.logging.LoggingMethodLocator;
+import jenkins.model.logging.LogBrowser;
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -54,10 +51,10 @@
 public class ExternalPipelineLogStorage implements LogStorage {
 
     private final ExternalLoggingMethod lm;
-    private final ExternalLogBrowser logBrowser;
+    private final LogBrowser logBrowser;
     private final WorkflowRun run;
 
-    ExternalPipelineLogStorage(@Nonnull WorkflowRun run, @Nonnull ExternalLoggingMethod lm, @Nonnull ExternalLogBrowser browser) {
+    ExternalPipelineLogStorage(@Nonnull WorkflowRun run, @Nonnull ExternalLoggingMethod lm, @Nonnull LogBrowser browser) {
         this.run = run;
         this.lm = lm;
         this.logBrowser = browser;
@@ -77,15 +74,15 @@ public TaskListener nodeListener(@Nonnull FlowNode flowNode) throws IOException,
 
     @Nonnull
     @Override
-    public AnnotatedLargeText overallLog(@Nonnull FlowExecutionOwner.Executable executable, boolean b) {
+    public AnnotatedLargeText overallLog(@Nonnull FlowExecutionOwner.Executable executable, boolean completed) {
         //TODO: Handle executable? Why is it needed at all?
-        return logBrowser.overallLog((WorkflowRun)executable, b);
+        return logBrowser.overallLog();
     }
 
     @Nonnull
     @Override
-    public AnnotatedLargeText stepLog(@Nonnull FlowNode flowNode, boolean b) {
-        return logBrowser.stepLog(run, flowNode.getId(), b);
+    public AnnotatedLargeText stepLog(@Nonnull FlowNode flowNode, boolean completed) {
+        return logBrowser.stepLog(flowNode.getId(), completed);
     }
 
 
@@ -98,7 +95,7 @@ private static class PipelineListener implements BuildListener {
         private transient PrintStream logger;
 
         PipelineListener(WorkflowRun run, ExternalLoggingMethod method) {
-            this.writer = method.createWriter(run);
+            this.writer = method.createWriter();
             this.sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings(run);
             writer.addMetadataEntry("jobId", UniqueIdHelper.getOrCreateId(run.getParent()));
         }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
index 7c0dfcf..5005715 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
@@ -3,11 +3,8 @@
 import hudson.Extension;
 import hudson.model.Queue;
 import hudson.model.Run;
-import hudson.model.queue.SubTask;
-import io.jenkins.plugins.extlogging.api.ExternalLogBrowser;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import io.jenkins.plugins.extlogging.api.integrations.MaskPasswordsSensitiveStringsProvider.MaskSensitiveStringsProvider;
-import jenkins.model.GlobalConfiguration;
 import jenkins.model.logging.LogBrowser;
 import jenkins.model.logging.LoggingMethod;
 import jenkins.model.logging.LoggingMethodLocator;
@@ -15,6 +12,8 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.jenkinsci.plugins.workflow.log.LogStorage;
 import org.jenkinsci.plugins.workflow.log.LogStorageFactory;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -23,9 +22,11 @@
 import java.util.logging.Logger;
 
 /**
+ * Bridges Jenkins Core external logging API and Pipeline external logging API.
  * @author Oleg Nenashev
  * @since TODO
  */
+@Restricted(NoExternalUse.class)
 @Extension(optional = true)
 public class ExternalPipelineLogStorageFactory implements LogStorageFactory {
 
@@ -53,12 +54,12 @@ public LogStorage forBuild(@Nonnull FlowExecutionOwner flowExecutionOwner) {
         }
 
         final LoggingMethod loggingMethod = LoggingMethodLocator.locate(run);
-        if (loggingMethod instanceof ExternalLoggingMethod) {
-            ExternalLoggingMethod lm = (ExternalLoggingMethod)loggingMethod;
+        final LogBrowser browser = LoggingMethodLocator.locateBrowser(run);
 
-            // TODO: Support configuration, type check
-            LogBrowser browser = lm.getDefaulLogBrowser();
-            return new ExternalPipelineLogStorage(run, lm, (ExternalLogBrowser) browser);
+        if (loggingMethod instanceof ExternalLoggingMethod) {
+            return new ExternalPipelineLogStorage(run,
+                    (ExternalLoggingMethod) loggingMethod,
+                    browser);
         }
 
         return null;
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
index faf8afc..6417870 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
@@ -5,8 +5,9 @@
 import hudson.tasks.Shell;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
 import io.jenkins.plugins.extlogging.api.util.MockExternalLoggingEventWriter;
-import io.jenkins.plugins.extlogging.api.util.MockLogBrowser;
+import io.jenkins.plugins.extlogging.api.util.MockLogBrowserFactory;
 import io.jenkins.plugins.extlogging.api.util.MockLoggingMethod;
+import io.jenkins.plugins.extlogging.api.util.MockLoggingMethodFactory;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -14,6 +15,8 @@
 import org.junit.rules.TemporaryFolder;
 import org.jvnet.hudson.test.JenkinsRule;
 
+import java.io.File;
+
 /**
  * @author Oleg Nenashev
  * @since TODO
@@ -26,14 +29,15 @@ public class FreestyleJobTest {
     @Rule
     public TemporaryFolder tmpDir = new TemporaryFolder();
 
-    private MockLoggingMethod loggingMethod;
+    private MockLoggingMethodFactory loggingMethodFactory;
 
     @Before
     public void setup() throws Exception {
         ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
-        loggingMethod = new MockLoggingMethod(tmpDir.newFolder("logs"));
-        cfg.setLoggingMethod(loggingMethod);
-        cfg.setLogBrowser(new MockLogBrowser());
+        File logDir = tmpDir.newFolder("logs");
+        loggingMethodFactory = new MockLoggingMethodFactory(logDir);
+        cfg.setLoggingMethod(loggingMethodFactory);
+        cfg.setLogBrowser(new MockLogBrowserFactory(logDir));
     }
 
     @Test
@@ -42,7 +46,8 @@ public void spotcheck() throws Exception {
         project.getBuildersList().add(new Shell("echo hello"));
 
         FreeStyleBuild build = j.buildAndAssertSuccess(project);
-        MockExternalLoggingEventWriter writer = loggingMethod.getWriter(build);
+        MockLoggingMethod lm = (MockLoggingMethod)build.getLoggingMethod();
+        MockExternalLoggingEventWriter writer = lm.getWriter();
         Assert.assertTrue(writer.isEventWritten());
     }
 
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
index 9a36176..53f1cd8 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
@@ -4,7 +4,9 @@
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
 import io.jenkins.plugins.extlogging.api.util.MockExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.util.MockLogBrowser;
+import io.jenkins.plugins.extlogging.api.util.MockLogBrowserFactory;
 import io.jenkins.plugins.extlogging.api.util.MockLoggingMethod;
+import io.jenkins.plugins.extlogging.api.util.MockLoggingMethodFactory;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.Assert;
@@ -14,6 +16,8 @@
 import org.junit.rules.TemporaryFolder;
 import org.jvnet.hudson.test.JenkinsRule;
 
+import java.io.File;
+
 /**
  * @author Oleg Nenashev
  * @since TODO
@@ -26,14 +30,16 @@ public class PipelineSmokeTest {
     @Rule
     public TemporaryFolder tmpDir = new TemporaryFolder();
 
-    private MockLoggingMethod loggingMethod;
+    private MockLoggingMethodFactory loggingMethodFactory;
+
 
     @Before
     public void setup() throws Exception {
         ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
-        loggingMethod = new MockLoggingMethod(tmpDir.newFolder("logs"));
-        cfg.setLoggingMethod(loggingMethod);
-        cfg.setLogBrowser(new MockLogBrowser());
+        File logDir = tmpDir.newFolder("logs");
+        loggingMethodFactory = new MockLoggingMethodFactory(logDir);
+        cfg.setLoggingMethod(loggingMethodFactory);
+        cfg.setLogBrowser(new MockLogBrowserFactory(logDir));
     }
 
     @Test
@@ -42,7 +48,8 @@ public void spotcheck_Master() throws Exception {
         project.setDefinition(new CpsFlowDefinition("echo Hello", true));
 
         Run build = j.buildAndAssertSuccess(project);
-        MockExternalLoggingEventWriter writer = loggingMethod.getWriter(build);
+        MockLoggingMethod loggingMethod = (MockLoggingMethod)build.getLoggingMethod();
+        MockExternalLoggingEventWriter writer = loggingMethod.getWriter();
         Assert.assertTrue(writer.isEventWritten());
     }
 
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
index c71029d..659ee8d 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
@@ -1,7 +1,7 @@
 package io.jenkins.plugins.extlogging.api.util;
 
 import io.jenkins.plugins.extlogging.api.Event;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
index 7d3bd99..9e1e2d0 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
@@ -1,17 +1,32 @@
 package io.jenkins.plugins.extlogging.api.util;
 
 import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
-import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.impl.FileLogBrowser;
 
-import javax.annotation.CheckForNull;
-import java.io.OutputStream;
+
+import java.io.File;
+import java.io.IOException;
 
 /**
  * @author Oleg Nenashev
  * @since TODO
  */
-public class MockLogBrowser extends LogBrowser {
+public class MockLogBrowser extends FileLogBrowser {
+
+    private File baseDir;
+
+    public MockLogBrowser(Run run, File baseDir) {
+        super(run);
+        this.baseDir = baseDir;
+    }
+
+    @Override
+    protected Run getOwner() {
+        return (Run)super.getOwner();
+    }
 
+    @Override
+    public File getLogFile() throws IOException {
+        return new File(baseDir, getOwner().getFullDisplayName() + ".txt");
+    }
 }
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java
new file mode 100644
index 0000000..bb939ff
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java
@@ -0,0 +1,26 @@
+package io.jenkins.plugins.extlogging.api.util;
+
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactory;
+import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.Loggable;
+
+import java.io.File;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class MockLogBrowserFactory extends ExternalLogBrowserFactory {
+
+    private File baseDir;
+
+    public MockLogBrowserFactory(File baseDir) {
+        this.baseDir = baseDir;
+    }
+
+    @Override
+    public LogBrowser create(Loggable loggable) {
+        return new MockLogBrowser((Run)loggable, baseDir);
+    }
+}
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
index 9ddf8d6..00c100f 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
@@ -1,7 +1,7 @@
 package io.jenkins.plugins.extlogging.api.util;
 
 import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import jenkins.model.logging.LogBrowser;
 
@@ -9,7 +9,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.HashMap;
 
 /**
  * @author Oleg Nenashev
@@ -17,41 +16,42 @@
  */
 public class MockLoggingMethod extends ExternalLoggingMethod {
 
-    File baseDir;
-    transient HashMap writers;
+    private File baseDir;
+    transient MockExternalLoggingEventWriter writer;
 
-    public MockLoggingMethod(File baseDir) {
+    public MockLoggingMethod(Run run, File baseDir) {
+        super(run);
         this.baseDir = baseDir;
     }
 
     @Override
-    public ExternalLoggingEventWriter createWriter(Run run) {
-        final MockExternalLoggingEventWriter writer;
+    protected Run getOwner() {
+        return (Run)super.getOwner();
+    }
+
+    @Override
+    public ExternalLoggingEventWriter createWriter() {
         try {
-            writer = new MockExternalLoggingEventWriter(new File(baseDir, run.getFullDisplayName() + ".txt"));
+            writer = new MockExternalLoggingEventWriter(new File(baseDir, getOwner().getFullDisplayName() + ".txt"));
         } catch (IOException ex) {
             throw new AssertionError(ex);
         }
-        writers.put(run, writer);
         return writer;
     }
 
-    public HashMap getWriters() {
-        return writers;
-    }
 
-    public MockExternalLoggingEventWriter getWriter(Run run) {
-        return writers.get(run);
+    public MockExternalLoggingEventWriter getWriter() {
+        return writer;
     }
 
     @Override
-    public OutputStream decorateLogger(Run run, OutputStream logger) {
+    public OutputStream decorateLogger(OutputStream logger) {
         throw new AssertionError("Not Implemented");
     }
 
     @CheckForNull
     @Override
-    public LogBrowser getDefaulLogBrowser() {
-        return new MockLogBrowser();
+    public LogBrowser getDefaultLogBrowser() {
+        return new MockLogBrowser(getOwner(), baseDir);
     }
 }
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java
new file mode 100644
index 0000000..20c5c05
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java
@@ -0,0 +1,29 @@
+package io.jenkins.plugins.extlogging.api.util;
+
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactory;
+import jenkins.model.logging.Loggable;
+
+import javax.annotation.CheckForNull;
+import java.io.File;
+import java.util.HashMap;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class MockLoggingMethodFactory extends ExternalLoggingMethodFactory {
+
+    private File baseDir;
+
+    public MockLoggingMethodFactory(File baseDir) {
+        this.baseDir = baseDir;
+    }
+
+    @CheckForNull
+    @Override
+    public ExternalLoggingMethod create(Loggable loggable) {
+        return new MockLoggingMethod((Run)loggable, baseDir);
+    }
+}
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
index 8de73cb..1f0928e 100644
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
@@ -2,28 +2,33 @@
 
 import hudson.console.AnnotatedLargeText;
 import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.ExternalLogBrowser;
-import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
-import org.jenkinsci.plugins.workflow.graph.FlowNode;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import jenkins.model.logging.LogBrowser;
 
 import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 
 /**
  * @author Oleg Nenashev
  * @since TODO
  */
-public class ElasticsearchLogBrowser extends ExternalLogBrowser {
+public class ElasticsearchLogBrowser extends LogBrowser {
+
+    public ElasticsearchLogBrowser(Run run) {
+        super(run);
+    }
+
+    @Override
+    protected Run getOwner() {
+        return (Run)super.getOwner();
+    }
 
     //TODO: Cache values instead of refreshing them each time
     @Override
-    public AnnotatedLargeText overallLog(@Nonnull Run run, boolean b) {
-        return new ElasticsearchLogLargeTextProvider(run, null).getLogText();
+    public AnnotatedLargeText overallLog() {
+        return new ElasticsearchLogLargeTextProvider(getOwner(), null).getLogText();
     }
 
     @Override
-    public AnnotatedLargeText stepLog(@Nonnull Run run, @CheckForNull String stepId, boolean b) {
-        return new ElasticsearchLogLargeTextProvider(run, stepId).getLogText();
+    public AnnotatedLargeText stepLog(@CheckForNull String stepId, boolean b) {
+        return new ElasticsearchLogLargeTextProvider(getOwner(), stepId).getLogText();
     }
 }
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java
new file mode 100644
index 0000000..bafe4b6
--- /dev/null
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java
@@ -0,0 +1,40 @@
+package io.jenkins.plugins.extlogging.elasticsearch;
+
+import hudson.Extension;
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactory;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactoryDescriptor;
+import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.Loggable;
+import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * Produces {@link ElasticsearchLogBrowser}s.
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class ElasticsearchLogBrowserFactory extends ExternalLogBrowserFactory {
+
+    @DataBoundConstructor
+    public ElasticsearchLogBrowserFactory() {
+
+    }
+
+    @CheckForNull
+    @Override
+    public LogBrowser create(Loggable loggable) {
+        if (loggable instanceof Run) {
+            return new ElasticsearchLogBrowser((Run) loggable);
+        }
+        return null;
+    }
+
+    @Extension
+    @Symbol("logstashElasticsearch")
+    public static class DescriptorImpl extends ExternalLogBrowserFactoryDescriptor {
+
+    }
+}
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
index 0b82b82..2271781 100644
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
@@ -5,16 +5,18 @@
 import java.io.OutputStream;
 import java.util.List;
 
-import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowser;
 import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.Loggable;
 import jenkins.plugins.logstash.LogstashConfiguration;
 import jenkins.plugins.logstash.persistence.ElasticSearchDao;
 import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 /**
  * Perform logging to {@link LogstashIndexerDao}.
@@ -23,26 +25,36 @@
  */
 public class LogstashDaoLoggingMethod extends ExternalLoggingMethod {
 
-    String prefix;
-
     @CheckForNull
+    private final String prefix;
+
+    public LogstashDaoLoggingMethod(Run run, @CheckForNull String prefix) {
+        super(run);
+        this.prefix = prefix;
+    }
+
+    @Override
+    protected Run getOwner() {
+        return (Run)super.getOwner();
+    }
+
     @Override
-    public LogBrowser getDefaulLogBrowser() {
+    public LogBrowser getDefaultLogBrowser() {
         LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance();
         if (dao instanceof ElasticSearchDao) {
-            return new ElasticsearchLogBrowser();
+            return new ElasticsearchLogBrowser(getOwner());
         }
         return null;
     }
 
     @Override
-    public ExternalLoggingEventWriter createWriter(Run run) {
+    public ExternalLoggingEventWriter createWriter() {
         LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance();
-        return new RemoteLogstashWriter(run, TaskListener.NULL, prefix, dao);
+        return new RemoteLogstashWriter(getOwner(), TaskListener.NULL, prefix, dao);
     }
 
     @Override
-    public OutputStream decorateLogger(Run run, OutputStream logger) {
+    public OutputStream decorateLogger(OutputStream logger) {
       //  LogstashWriter logstash = new LogstashWriter(run, TaskListener.NULL, logger, prefix);
       //  RemoteLogstashOutputStream los = new RemoteLogstashOutputStream(logstash, "prefix");
       //  return los.maskPasswords(SensitiveStringsProvider.getAllSensitiveStrings(run));
@@ -64,11 +76,6 @@ public Object readResolve() {
             return ExternalLoggingOutputStream.createOutputStream(wr, passwordStrings);
         }
 
-        @Override
-        public OutputStream toRawOutputStream() {
-            return toSerializableOutputStream();
-        }
-
         @Override
         public OutputStream toSerializableOutputStream() {
             return ExternalLoggingOutputStream.createOutputStream(wr, passwordStrings);
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java
new file mode 100644
index 0000000..8948ea1
--- /dev/null
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java
@@ -0,0 +1,48 @@
+package io.jenkins.plugins.extlogging.logstash;
+
+import hudson.Extension;
+import hudson.model.Run;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactory;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactoryDescriptor;
+import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowser;
+import jenkins.model.logging.Loggable;
+import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class LogstashDaoLoggingMethodFactory extends ExternalLoggingMethodFactory {
+
+    @CheckForNull
+    private String prefix;
+
+    @DataBoundConstructor
+    public LogstashDaoLoggingMethodFactory() {
+
+    }
+
+    @DataBoundSetter
+    public void setPrefix(@CheckForNull String prefix) {
+        this.prefix = prefix;
+    }
+
+    @Override
+    public ExternalLoggingMethod create(Loggable loggable) {
+        if (loggable instanceof Run) {
+            return new LogstashDaoLoggingMethod((Run) loggable, prefix);
+        }
+        return null;
+    }
+
+    @Extension
+    @Symbol("logstash")
+    public static final class DescriptorImpl extends ExternalLoggingMethodFactoryDescriptor {
+
+    }
+}
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
index 58d076d..479b9e9 100644
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
+++ b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
@@ -4,13 +4,14 @@
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import io.jenkins.plugins.extlogging.api.Event;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import jenkins.model.Jenkins;
 import jenkins.plugins.logstash.persistence.BuildData;
 import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.exception.ExceptionUtils;
 
+import javax.annotation.CheckForNull;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Date;
@@ -23,10 +24,11 @@ public class RemoteLogstashWriter extends ExternalLoggingEventWriter {
     private static final long serialVersionUID = 1L;
     private static final Logger LOGGER = Logger.getLogger(RemoteLogstashWriter.class.getName());
 
-    final String prefix;
-    final BuildData buildData;
-    final String jenkinsUrl;
-    LogstashIndexerDao dao;
+    @CheckForNull
+    private final String prefix;
+    private final BuildData buildData;
+    private final String jenkinsUrl;
+    private final LogstashIndexerDao dao;
     private boolean connectionBroken;
 
     public RemoteLogstashWriter(Run run, TaskListener listener, String prefix, LogstashIndexerDao dao) {

From 4915012d671807642893c96a6da520eb5e685d01 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 16 Jul 2018 12:00:24 +0300
Subject: [PATCH 09/23] =?UTF-8?q?Add=20=E2=80=9Cdisabled=E2=80=9D=20implem?=
 =?UTF-8?q?entations=20for=20Log=20Browser=20and=20Logging=20Method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DisabledExternalLogBrowserFactory.java    | 37 +++++++++++++++++++
 .../DisabledExternalLoggingMethodFactory.java | 36 ++++++++++++++++++
 .../ExternalLoggingGlobalConfiguration.java   |  2 +
 3 files changed, 75 insertions(+)
 create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java
 create mode 100644 external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java

diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java
new file mode 100644
index 0000000..626d679
--- /dev/null
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java
@@ -0,0 +1,37 @@
+package io.jenkins.plugins.extlogging.api.impl;
+
+import hudson.Extension;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactory;
+import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactoryDescriptor;
+import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.Loggable;
+import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+/**
+ * Default Disabled implementation.
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class DisabledExternalLogBrowserFactory extends ExternalLogBrowserFactory {
+
+    @DataBoundConstructor
+    public DisabledExternalLogBrowserFactory() {
+
+    }
+
+    @Override
+    public LogBrowser create(Loggable loggable) {
+        return null;
+    }
+
+    @Extension(ordinal = Float.MAX_VALUE)
+    @Symbol("disabled")
+    public static class DescriptorImpl extends ExternalLogBrowserFactoryDescriptor {
+
+        @Override
+        public String getDisplayName() {
+            return "Disabled";
+        }
+    }
+}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
new file mode 100644
index 0000000..b2c9134
--- /dev/null
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
@@ -0,0 +1,36 @@
+package io.jenkins.plugins.extlogging.api.impl;
+
+import hudson.Extension;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactory;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactoryDescriptor;
+import jenkins.model.logging.Loggable;
+import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class DisabledExternalLoggingMethodFactory extends ExternalLoggingMethodFactory {
+
+    @DataBoundConstructor
+    public DisabledExternalLoggingMethodFactory() {
+
+    }
+
+    @Override
+    public ExternalLoggingMethod create(Loggable loggable) {
+        return null;
+    }
+
+    @Extension(ordinal = Float.MAX_VALUE)
+    @Symbol("logstash")
+    public static final class DescriptorImpl extends ExternalLoggingMethodFactoryDescriptor {
+
+        @Override
+        public String getDisplayName() {
+            return "disabled";
+        }
+    }
+}
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
index 15700e6..61f8d04 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
@@ -4,6 +4,7 @@
 import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactory;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactory;
 import jenkins.model.GlobalConfiguration;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundSetter;
 
 import javax.annotation.CheckForNull;
@@ -15,6 +16,7 @@
  * @since TODO
  */
 @Extension
+@Symbol("externalLogging")
 public class ExternalLoggingGlobalConfiguration extends GlobalConfiguration {
 
     private static final ExternalLoggingGlobalConfiguration DEFAULT = new DefaultExternalLoggingGlobalConfiguration();

From 5712faf737bb5053ba0c1aecc054d10771943e50 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 16 Jul 2018 15:38:09 +0300
Subject: [PATCH 10/23] Use the latest PluginPOM

---
 external-logging-api/pom.xml           | 2 +-
 external-logging-elasticsearch/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/external-logging-api/pom.xml b/external-logging-api/pom.xml
index fefa409..ec65fa8 100644
--- a/external-logging-api/pom.xml
+++ b/external-logging-api/pom.xml
@@ -5,7 +5,7 @@
   
     org.jenkins-ci.plugins
     plugin
-    3.15
+    3.18
     
   
 
diff --git a/external-logging-elasticsearch/pom.xml b/external-logging-elasticsearch/pom.xml
index 476be78..b4bf8b5 100644
--- a/external-logging-elasticsearch/pom.xml
+++ b/external-logging-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
   
     org.jenkins-ci.plugins
     plugin
-    3.15
+    3.18
     
   
 

From 7c704d78fa17253ca1559bbee0013646f98a154e Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 16 Jul 2018 18:02:57 +0300
Subject: [PATCH 11/23] Fix tests for Jenkins Pipeline

---
 .../extlogging/api/ExternalLoggingMethod.java |  2 +-
 .../api/impl/ExternalLoggingEventWriter.java  | 10 ++++++
 .../ExternalLoggingGlobalConfiguration.java   |  1 +
 .../pipeline/ExternalPipelineLogStorage.java  |  5 +++
 .../extlogging/api/FreestyleJobTest.java      | 19 ++++++------
 .../extlogging/api/PipelineSmokeTest.java     | 31 +++++++++++--------
 .../util/MockExternalLoggingEventWriter.java  | 20 +++++-------
 .../extlogging/api/util/MockLogBrowser.java   |  8 ++++-
 .../api/util/MockLoggingMethod.java           | 10 ++----
 .../api/util/MockLoggingTestUtil.java         | 24 ++++++++++++++
 10 files changed, 87 insertions(+), 43 deletions(-)
 create mode 100644 external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java

diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index 951ed76..daf7a97 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -40,7 +40,7 @@ public ConsoleLogFilter createLoggerDecorator() {
         return new ConsoleLogFilter() {
             @Override
             public OutputStream decorateLogger(Run run, OutputStream logger) throws IOException, InterruptedException {
-                return decorateLogger(run, logger);
+                return ExternalLoggingMethod.this.decorateLogger(logger);
             }
         };
     }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
index bd7b43b..75a3793 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
@@ -33,4 +33,14 @@ public void write(char[] cbuf, int off, int len) throws IOException {
         String message = new String(cbuf, off, len);
         writeMessage(message);
     }
+
+    @Override
+    public void close() throws IOException {
+        // noop
+    }
+
+    @Override
+    public void flush() throws IOException {
+        // noop
+    }
 }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
index 61f8d04..411354f 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
@@ -30,6 +30,7 @@ public class ExternalLoggingGlobalConfiguration extends GlobalConfiguration {
     @Nonnull
     public static ExternalLoggingGlobalConfiguration getInstance() {
         ExternalLoggingGlobalConfiguration cfg = GlobalConfiguration.all().get(ExternalLoggingGlobalConfiguration.class);
+        assert cfg != null : "Global configuration should be present";
         return cfg != null ? cfg : DEFAULT;
     }
 
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
index 90fd9fe..3c94421 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
@@ -43,6 +43,8 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Collection;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 
 /**
@@ -50,6 +52,9 @@
  */
 public class ExternalPipelineLogStorage implements LogStorage {
 
+    private static final Logger LOGGER =
+            Logger.getLogger(ExternalPipelineLogStorage.class.getName());
+
     private final ExternalLoggingMethod lm;
     private final LogBrowser logBrowser;
     private final WorkflowRun run;
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
index 6417870..66baaa3 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
@@ -8,6 +8,7 @@
 import io.jenkins.plugins.extlogging.api.util.MockLogBrowserFactory;
 import io.jenkins.plugins.extlogging.api.util.MockLoggingMethod;
 import io.jenkins.plugins.extlogging.api.util.MockLoggingMethodFactory;
+import io.jenkins.plugins.extlogging.api.util.MockLoggingTestUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -29,19 +30,18 @@ public class FreestyleJobTest {
     @Rule
     public TemporaryFolder tmpDir = new TemporaryFolder();
 
-    private MockLoggingMethodFactory loggingMethodFactory;
+    @Test
+    public void spotcheck_Default() throws Exception {
+        FreeStyleProject project = j.createFreeStyleProject();
+        project.getBuildersList().add(new Shell("echo hello"));
 
-    @Before
-    public void setup() throws Exception {
-        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
-        File logDir = tmpDir.newFolder("logs");
-        loggingMethodFactory = new MockLoggingMethodFactory(logDir);
-        cfg.setLoggingMethod(loggingMethodFactory);
-        cfg.setLogBrowser(new MockLogBrowserFactory(logDir));
+        FreeStyleBuild build = j.buildAndAssertSuccess(project);
+        j.assertLogContains("hello", build);
     }
 
     @Test
-    public void spotcheck() throws Exception {
+    public void spotcheck_Mock() throws Exception {
+        MockLoggingTestUtil.setup(tmpDir);
         FreeStyleProject project = j.createFreeStyleProject();
         project.getBuildersList().add(new Shell("echo hello"));
 
@@ -49,6 +49,7 @@ public void spotcheck() throws Exception {
         MockLoggingMethod lm = (MockLoggingMethod)build.getLoggingMethod();
         MockExternalLoggingEventWriter writer = lm.getWriter();
         Assert.assertTrue(writer.isEventWritten());
+        j.assertLogContains("hello", build);
     }
 
 }
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
index 53f1cd8..9fe0898 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
@@ -7,6 +7,7 @@
 import io.jenkins.plugins.extlogging.api.util.MockLogBrowserFactory;
 import io.jenkins.plugins.extlogging.api.util.MockLoggingMethod;
 import io.jenkins.plugins.extlogging.api.util.MockLoggingMethodFactory;
+import io.jenkins.plugins.extlogging.api.util.MockLoggingTestUtil;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.Assert;
@@ -18,6 +19,10 @@
 
 import java.io.File;
 
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
 /**
  * @author Oleg Nenashev
  * @since TODO
@@ -30,27 +35,27 @@ public class PipelineSmokeTest {
     @Rule
     public TemporaryFolder tmpDir = new TemporaryFolder();
 
-    private MockLoggingMethodFactory loggingMethodFactory;
-
-
-    @Before
-    public void setup() throws Exception {
-        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
-        File logDir = tmpDir.newFolder("logs");
-        loggingMethodFactory = new MockLoggingMethodFactory(logDir);
-        cfg.setLoggingMethod(loggingMethodFactory);
-        cfg.setLogBrowser(new MockLogBrowserFactory(logDir));
+    @Test
+    public void spotcheck_Default() throws Exception {
+        WorkflowJob project = j.createProject(WorkflowJob.class);
+        project.setDefinition(new CpsFlowDefinition("echo 'Hello'", true));
+        Run build = j.buildAndAssertSuccess(project);
+        j.assertLogContains("Hello", build);
     }
 
     @Test
-    public void spotcheck_Master() throws Exception {
+    public void spotcheck_Mock() throws Exception {
+        MockLoggingTestUtil.setup(tmpDir);
         WorkflowJob project = j.createProject(WorkflowJob.class);
-        project.setDefinition(new CpsFlowDefinition("echo Hello", true));
+        project.setDefinition(new CpsFlowDefinition("echo 'Hello'", true));
 
         Run build = j.buildAndAssertSuccess(project);
+        assertThat(build.getLoggingMethod(), instanceOf(MockLoggingMethod.class));
         MockLoggingMethod loggingMethod = (MockLoggingMethod)build.getLoggingMethod();
         MockExternalLoggingEventWriter writer = loggingMethod.getWriter();
-        Assert.assertTrue(writer.isEventWritten());
+        // Do not try to add it. Pipeline creates separate PipelineLogListeners for each call
+        // Assert.assertTrue(writer.isEventWritten());
+        j.assertLogContains("Hello", build);
     }
 
 }
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
index 659ee8d..19e32fa 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
@@ -6,6 +6,8 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * @author Oleg Nenashev
@@ -13,30 +15,24 @@
  */
 public class MockExternalLoggingEventWriter extends ExternalLoggingEventWriter {
 
+    private static final Logger LOGGER =
+            Logger.getLogger(MockExternalLoggingEventWriter.class.getName());
+
     public File dest;
-    private FileWriter writer;
 
     // Debug flags
     private boolean eventWritten;
 
-    public MockExternalLoggingEventWriter(File dest) throws IOException {
+    public MockExternalLoggingEventWriter(File dest) {
         this.dest = dest;
-        this.writer = new FileWriter(dest);
     }
 
     @Override
     public void writeEvent(Event event) throws IOException {
         eventWritten = true;
-        writer.write(event.toStringWithData() + "\n");
-    }
-
-    @Override
-    public void flush() throws IOException {
+        FileWriter writer = new FileWriter(dest, true);
+        writer.write(event.toString() + "\n");
         writer.flush();
-    }
-
-    @Override
-    public void close() throws IOException {
         writer.close();
     }
 
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
index 9e1e2d0..789c972 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
@@ -1,11 +1,14 @@
 package io.jenkins.plugins.extlogging.api.util;
 
 import hudson.model.Run;
+import jenkins.model.logging.Loggable;
 import jenkins.model.logging.impl.FileLogBrowser;
 
 
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * @author Oleg Nenashev
@@ -13,6 +16,9 @@
  */
 public class MockLogBrowser extends FileLogBrowser {
 
+    private static final Logger LOGGER =
+            Logger.getLogger(MockLogBrowser.class.getName());
+
     private File baseDir;
 
     public MockLogBrowser(Run run, File baseDir) {
@@ -26,7 +32,7 @@ public MockLogBrowser(Run run, File baseDir) {
     }
 
     @Override
-    public File getLogFile() throws IOException {
+    public File getLogFileOrFail(Loggable loggable) throws IOException {
         return new File(baseDir, getOwner().getFullDisplayName() + ".txt");
     }
 }
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
index 00c100f..5cf2c05 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
@@ -31,22 +31,18 @@ public MockLoggingMethod(Run run, File baseDir) {
 
     @Override
     public ExternalLoggingEventWriter createWriter() {
-        try {
-            writer = new MockExternalLoggingEventWriter(new File(baseDir, getOwner().getFullDisplayName() + ".txt"));
-        } catch (IOException ex) {
-            throw new AssertionError(ex);
-        }
+        writer = new MockExternalLoggingEventWriter(new File(baseDir, getOwner().getFullDisplayName() + ".txt"));
         return writer;
     }
 
-
+    @CheckForNull
     public MockExternalLoggingEventWriter getWriter() {
         return writer;
     }
 
     @Override
     public OutputStream decorateLogger(OutputStream logger) {
-        throw new AssertionError("Not Implemented");
+        return logger;
     }
 
     @CheckForNull
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java
new file mode 100644
index 0000000..3d4f3db
--- /dev/null
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java
@@ -0,0 +1,24 @@
+package io.jenkins.plugins.extlogging.api.util;
+
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
+import org.junit.Before;
+import org.junit.rules.TemporaryFolder;
+
+import javax.annotation.Nonnull;
+import java.io.File;
+
+/**
+ * Test util for mock classes.
+ * @author Oleg Nenashev
+ * @see MockLogBrowser
+ * @see MockLoggingMethod
+ */
+public class MockLoggingTestUtil {
+
+    public static void setup(@Nonnull TemporaryFolder tmpDir) throws Exception {
+        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
+        File logDir = tmpDir.newFolder("logs");
+        cfg.setLoggingMethod(new MockLoggingMethodFactory(logDir));
+        cfg.setLogBrowser(new MockLogBrowserFactory(logDir));
+    }
+}

From 9c9b87bd44b2f5f280758ff9b3c768db01240553 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 16 Jul 2018 21:42:06 +0300
Subject: [PATCH 12/23] Add integration tests for the External Logging for
 Elasticsearch Plugin

---
 external-logging-api/pom.xml                  | 15 +++++
 .../extlogging/api/FreestyleJobTest.java      |  3 +
 external-logging-elasticsearch/pom.xml        | 51 +++++++++++++++
 .../elasticsearch/ElasticsearchContainer.java | 64 +++++++++++++++++++
 .../elasticsearch/PipelineSmokeTest.java      | 44 +++++++++++++
 .../ElasticsearchContainer/Dockerfile         |  3 +
 6 files changed, 180 insertions(+)
 create mode 100644 external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
 create mode 100644 external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
 create mode 100644 external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile

diff --git a/external-logging-api/pom.xml b/external-logging-api/pom.xml
index ec65fa8..b4780f9 100644
--- a/external-logging-api/pom.xml
+++ b/external-logging-api/pom.xml
@@ -88,6 +88,21 @@
       2.2
       test
     
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-step-api
+      2.13
+    
+    
+      org.jenkins-ci.plugins
+      scm-api
+      2.2.6
+    
+    
+      org.jenkins-ci.plugins
+      script-security
+      1.39
+    
     
       org.jenkins-ci.plugins
       credentials-binding
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
index 66baaa3..9d3b89c 100644
--- a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
+++ b/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
@@ -11,6 +11,7 @@
 import io.jenkins.plugins.extlogging.api.util.MockLoggingTestUtil;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -39,7 +40,9 @@ public void spotcheck_Default() throws Exception {
         j.assertLogContains("hello", build);
     }
 
+    //TODO: implementation issues
     @Test
+    @Ignore
     public void spotcheck_Mock() throws Exception {
         MockLoggingTestUtil.setup(tmpDir);
         FreeStyleProject project = j.createFreeStyleProject();
diff --git a/external-logging-elasticsearch/pom.xml b/external-logging-elasticsearch/pom.xml
index b4bf8b5..a1c5c3c 100644
--- a/external-logging-elasticsearch/pom.xml
+++ b/external-logging-elasticsearch/pom.xml
@@ -55,6 +55,57 @@
       structs
       1.14
     
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-cps
+      2.19
+      test
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-basic-steps
+      2.2
+      test
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-durable-task-step
+      2.20-rc333.74dc7c303e6d 
+      test
+    
+
+    
+    
+      org.jenkins-ci.test
+      docker-fixtures
+      1.7
+      test
+    
+
   
 
   
diff --git a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
new file mode 100644
index 0000000..b5aa172
--- /dev/null
+++ b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
@@ -0,0 +1,64 @@
+package io.jenkins.plugins.extlogging.elasticsearch;
+
+import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
+import io.jenkins.plugins.extlogging.logstash.LogstashDaoLoggingMethodFactory;
+import jenkins.plugins.logstash.LogstashConfiguration;
+import jenkins.plugins.logstash.LogstashInstallation;
+import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
+import org.jenkinsci.test.acceptance.docker.DockerContainer;
+import org.jenkinsci.test.acceptance.docker.DockerFixture;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Elasticsearch test container.
+ * @author Oleg Nenashev
+ */
+@DockerFixture(id = "elasticsearch", ports = 9200)
+public class ElasticsearchContainer extends DockerContainer {
+
+    @Nonnull
+    public URL getURL() {
+        try {
+            return new URL("http://" + ipBound(9200) + ":" + port(9200));
+        } catch (MalformedURLException ex) {
+            throw new AssertionError(ex);
+        }
+    }
+
+    public void configureJenkins(JenkinsRule j) throws AssertionError {
+        try {
+            LogstashInstallation.Descriptor descriptor = LogstashInstallation.getLogstashDescriptor();
+            setField(descriptor, "host", getURL().toString());
+            setField(descriptor, "port", 9200);
+            setField(descriptor, "key", "/logstash/logs");
+            setField(descriptor, "type", LogstashIndexerDao.IndexerType.ELASTICSEARCH);
+
+            // TODO: Replace by proper initialization once plugin API is fixed
+            // Currently setIndexer() method does not change active indexer.
+            LogstashConfiguration cfg = LogstashConfiguration.getInstance();
+            Field dataMigrated = cfg.getClass().getDeclaredField("dataMigrated");
+            dataMigrated.setAccessible(true);
+            dataMigrated.setBoolean(cfg, false);
+            LogstashConfiguration.getInstance().migrateData();
+        } catch (Exception ex) {
+            throw new AssertionError("Failed to configure Logstash Plugin using reflection", ex);
+        }
+
+        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
+        cfg.setLogBrowser(new ElasticsearchLogBrowserFactory());
+        cfg.setLoggingMethod(new LogstashDaoLoggingMethodFactory());
+
+    }
+
+    private final void setField(LogstashInstallation.Descriptor d, String field, Object value) throws NoSuchFieldException, IllegalAccessException {
+        Field dataMigrated = LogstashInstallation.Descriptor.class.getDeclaredField(field);
+        dataMigrated.setAccessible(true);
+        dataMigrated.set(d, value);
+    }
+}
\ No newline at end of file
diff --git a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
new file mode 100644
index 0000000..15cb2b4
--- /dev/null
+++ b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
@@ -0,0 +1,44 @@
+package io.jenkins.plugins.extlogging.elasticsearch;
+
+import hudson.model.Run;
+
+import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
+import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.test.acceptance.docker.DockerRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class PipelineSmokeTest {
+
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @Rule
+    public DockerRule esContainer = new DockerRule(ElasticsearchContainer.class);
+    private ElasticsearchContainer container;
+
+    @Before
+    public void setup() throws Exception {
+        container = esContainer.get();
+        container.configureJenkins(j);
+    }
+
+    @Test
+    public void spotcheck_Default() throws Exception {
+        WorkflowJob project = j.createProject(WorkflowJob.class);
+        project.setDefinition(new CpsFlowDefinition("echo 'Hello'", true));
+        Run build = j.buildAndAssertSuccess(project);
+        // Eventual consistency
+        //TODO(oleg_nenashev): Probably we need terminator entries in logs
+        //to automate handling of such use-cases
+        Thread.sleep(1000);
+        j.assertLogContains("Hello", build);
+    }
+
+}
diff --git a/external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile b/external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile
new file mode 100644
index 0000000..3a080a7
--- /dev/null
+++ b/external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile
@@ -0,0 +1,3 @@
+FROM sebp/elk:5610
+
+#TODO: Add support of easy Data browsing for tests?

From 549d9fa8a8444e00098048c0b528d073ad31d464 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Wed, 18 Jul 2018 13:44:25 +0300
Subject: [PATCH 13/23] Elasticsearch test container now can wait till ES fully
 starts up

---
 .../elasticsearch/ElasticsearchContainer.java | 80 +++++++++++++++++++
 .../elasticsearch/PipelineSmokeTest.java      |  7 +-
 2 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
index b5aa172..b68a2f8 100644
--- a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
+++ b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
@@ -3,16 +3,28 @@
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
 import io.jenkins.plugins.extlogging.logstash.LogstashDaoLoggingMethodFactory;
 import jenkins.plugins.logstash.LogstashConfiguration;
 import jenkins.plugins.logstash.LogstashInstallation;
 import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
 import org.jenkinsci.test.acceptance.docker.DockerContainer;
 import org.jenkinsci.test.acceptance.docker.DockerFixture;
 import org.jvnet.hudson.test.JenkinsRule;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -22,6 +34,9 @@
 @DockerFixture(id = "elasticsearch", ports = 9200)
 public class ElasticsearchContainer extends DockerContainer {
 
+    private static final Logger LOGGER =
+            Logger.getLogger(ElasticsearchContainer.class.getName());
+
     @Nonnull
     public URL getURL() {
         try {
@@ -61,4 +76,69 @@ private final void setField(LogstashInstallation.Descriptor d, String field, Obj
         dataMigrated.setAccessible(true);
         dataMigrated.set(d, value);
     }
+
+    public void waitForInit(int timeoutMs) throws AssertionError, Exception {
+
+        long startTime = System.currentTimeMillis();
+        ObjectMapper mapper = new ObjectMapper();
+
+        while (System.currentTimeMillis() < startTime + timeoutMs) {
+            try (CloseableHttpClient httpclient = HttpClients.createMinimal()) {
+                HttpGet httpGet = new HttpGet(getURL().toString());
+                try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
+                    if (response.getStatusLine().getStatusCode() == 200) {
+                        ElasticsearchInfo es = mapper.readValue(response.getEntity().getContent(), ElasticsearchInfo.class);
+                        LOGGER.log(Level.FINE, "ES version: " + es.version.number);
+                        return;
+                    }
+                } catch (NoHttpResponseException ex) {
+                  // Fine, keep trying
+                } catch (Exception ex) {
+                    // keep trying
+                    LOGGER.log(Level.WARNING, "Wrong response", ex);
+                }
+            }
+            Thread.sleep(1000);
+        }
+
+        throw new TimeoutException("Elasticsearch connection timeout: " + timeoutMs + "ms");
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ElasticsearchInfo {
+
+        @JsonProperty
+        public int status;
+
+        @JsonProperty
+        public String name;
+
+        @JsonProperty("cluster_name")
+        public String clusterName;
+
+        @JsonProperty
+        public ElasticsearchVersion version;
+
+        @JsonProperty
+        public String tagline;
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ElasticsearchVersion {
+
+        @JsonProperty
+        public String number;
+
+        @JsonProperty("build_hash")
+        public String buildHash;
+
+        @JsonProperty("build_timestamp")
+        public String buildTimestamp;
+
+        @JsonProperty("build_snapshot")
+        public boolean buildSnapshot;
+
+        @JsonProperty("lucene_version")
+        public String luceneVersion;
+    }
 }
\ No newline at end of file
diff --git a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
index 15cb2b4..9505b36 100644
--- a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
+++ b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
@@ -16,16 +16,17 @@
  */
 public class PipelineSmokeTest {
 
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
-
     @Rule
     public DockerRule esContainer = new DockerRule(ElasticsearchContainer.class);
     private ElasticsearchContainer container;
 
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
     @Before
     public void setup() throws Exception {
         container = esContainer.get();
+        container.waitForInit(30000);
         container.configureJenkins(j);
     }
 

From cbd730749af3d6083ada8439275d94e01e7f75ed Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 23 Jul 2018 09:45:05 +0300
Subject: [PATCH 14/23] Updates towards the new version of External Logging API
 and Logstash Plugin

---
 demo/packager-config.yml                      |  2 +-
 demo/src/main/groovy/2_ExtLogging.groovy      |  8 ++---
 external-logging-api/pom.xml                  |  2 +-
 .../jenkins/plugins/extlogging/api/Event.java | 12 ++++---
 .../api/impl/ExternalLoggingEventWriter.java  |  4 ++-
 external-logging-elasticsearch/pom.xml        |  2 +-
 .../elasticsearch/PipelineSmokeTest.java      | 33 +++++++++++++++++++
 7 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/demo/packager-config.yml b/demo/packager-config.yml
index 5bd9ec4..0b445ab 100644
--- a/demo/packager-config.yml
+++ b/demo/packager-config.yml
@@ -58,7 +58,7 @@ plugins:
   - groupId: "org.jenkins-ci.plugins"
     artifactId: "logstash"
     source:
-      version: 2.1.0
+      version: 2.1.1-SNAPSHOT
   - groupId: "io.jenkins.plugins.external-logging"
     artifactId: "external-logging-api"
     source:
diff --git a/demo/src/main/groovy/2_ExtLogging.groovy b/demo/src/main/groovy/2_ExtLogging.groovy
index 4c42dae..6aa0183 100644
--- a/demo/src/main/groovy/2_ExtLogging.groovy
+++ b/demo/src/main/groovy/2_ExtLogging.groovy
@@ -2,8 +2,8 @@ import jenkins.plugins.logstash.LogstashInstallation
 import jenkins.plugins.logstash.LogstashConfiguration
 import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration
-import io.jenkins.plugins.extlogging.logstash.LogstashDaoLoggingMethod
-import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowser
+import io.jenkins.plugins.extlogging.logstash.LogstashDaoLoggingMethodFactory
+import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowserFactory
 
 println("--- Configuring Logstash")
 String logstashPort = System.getProperty("elasticsearch.port");
@@ -22,5 +22,5 @@ LogstashConfiguration.instance.@dataMigrated = false
 LogstashConfiguration.instance.migrateData()
 
 println("--- Configuring External Logging")
-ExternalLoggingGlobalConfiguration.instance.loggingMethod = new LogstashDaoLoggingMethod()
-ExternalLoggingGlobalConfiguration.instance.logBrowser = new ElasticsearchLogBrowser()
+ExternalLoggingGlobalConfiguration.instance.loggingMethod = new LogstashDaoLoggingMethodFactory()
+ExternalLoggingGlobalConfiguration.instance.logBrowser = new ElasticsearchLogBrowserFactory()
diff --git a/external-logging-api/pom.xml b/external-logging-api/pom.xml
index b4780f9..cf86a02 100644
--- a/external-logging-api/pom.xml
+++ b/external-logging-api/pom.xml
@@ -91,7 +91,7 @@
     
       org.jenkins-ci.plugins.workflow
       workflow-step-api
-      2.13
+      2.15
     
     
       org.jenkins-ci.plugins
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
index 4101314..ffe7767 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
@@ -12,18 +12,20 @@ public class Event {
 
     final String message;
     final long timestamp;
+    final long id;
 
     Map data = new HashMap<>();
 
-    public Event(String message) {
-        this(message, System.currentTimeMillis());
-    }
-
-    public Event(String message, long timestamp) {
+    public Event(long id, String message, long timestamp) {
+        this.id = id;
         this.message = message;
         this.timestamp = timestamp;
     }
 
+    public long getId() {
+        return id;
+    }
+
     public String getMessage() {
         return message;
     }
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
index 75a3793..74a30f3 100644
--- a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
+++ b/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
@@ -7,6 +7,7 @@
 import java.io.Writer;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * @author Oleg Nenashev
@@ -15,11 +16,12 @@
 public abstract class ExternalLoggingEventWriter extends Writer implements Serializable {
 
     Map metadata = new HashMap<>();
+    AtomicLong messageCounter = new AtomicLong();
 
     public abstract void writeEvent(Event event) throws IOException;
 
     public void writeMessage(String message) throws IOException {
-        Event event = new Event(message);
+        Event event = new Event(messageCounter.getAndIncrement(), message, System.currentTimeMillis());
         event.setData(metadata); // We do not copy the entry to save performance, custom implementations may need better logic
         writeEvent(event);
     }
diff --git a/external-logging-elasticsearch/pom.xml b/external-logging-elasticsearch/pom.xml
index a1c5c3c..018ae1b 100644
--- a/external-logging-elasticsearch/pom.xml
+++ b/external-logging-elasticsearch/pom.xml
@@ -48,7 +48,7 @@
     
       org.jenkins-ci.plugins
       logstash
-      2.1.0
+      2.1.1-SNAPSHOT
     
     
       org.jenkins-ci.plugins
diff --git a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
index 9505b36..22c1d92 100644
--- a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
+++ b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
@@ -2,6 +2,7 @@
 
 import hudson.model.Run;
 
+import hudson.model.labels.LabelAtom;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.test.acceptance.docker.DockerRule;
@@ -42,4 +43,36 @@ public void spotcheck_Default() throws Exception {
         j.assertLogContains("Hello", build);
     }
 
+    @Test
+    public void spotcheck_cycle() throws Exception {
+        WorkflowJob project = j.createProject(WorkflowJob.class);
+        project.setDefinition(new CpsFlowDefinition("" +
+                "for (int i = 0; i<10; i++) {" +
+                "  sleep 1" +
+                "  echo \"count: ${i}\"" +
+                "}", true));
+        Run build = j.buildAndAssertSuccess(project);
+        // Eventual consistency
+        //TODO(oleg_nenashev): Probably we need terminator entries in logs
+        //to automate handling of such use-cases
+        Thread.sleep(1000);
+        j.assertLogContains("count: 9", build);
+    }
+
+    @Test
+    public void spotcheck_Agent() throws Exception {
+        j.createOnlineSlave(new LabelAtom("foo"));
+
+        WorkflowJob project = j.createProject(WorkflowJob.class);
+        project.setDefinition(new CpsFlowDefinition("node('foo') {" +
+                "  sh 'whoami'" +
+                "}", true));
+        Run build = j.buildAndAssertSuccess(project);
+        // Eventual consistency
+        //TODO(oleg_nenashev): Probably we need terminator entries in logs
+        //to automate handling of such use-cases
+        Thread.sleep(1000);
+        j.assertLogContains("Hello", build);
+    }
+
 }

From a5c694f5acf58a56ca6fc3bca5c721f5a3a8116e Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 23 Jul 2018 10:37:54 +0300
Subject: [PATCH 15/23] Move External Logging for Logstash to a separate plugin

---
 demo/Makefile                                 |  33 --
 demo/README.md                                |  72 -----
 demo/docker-compose.yml                       |  50 ---
 demo/packager-config.yml                      |  99 ------
 demo/pom.xml                                  |  88 ------
 demo/src/main/groovy/1_System.groovy          |  68 -----
 demo/src/main/groovy/2_ExtLogging.groovy      |  26 --
 demo/src/main/groovy/3_Agent.groovy           |  15 -
 demo/src/main/groovy/4_Jobs.groovy            |  56 ----
 demo/src/main/groovy/5_SaveToDisk.groovy      |   3 -
 demo/src/main/java/Stub.java                  |   6 -
 external-logging-api/pom.xml                  | 127 --------
 .../.mvn/extensions.xml                       |   7 -
 .../.mvn/maven.config                         |   2 -
 external-logging-elasticsearch/Jenkinsfile    |   1 -
 external-logging-elasticsearch/README.md      |   2 -
 external-logging-elasticsearch/pom.xml        | 124 --------
 .../ElasticsearchLogBrowser.java              |  34 ---
 .../ElasticsearchLogBrowserFactory.java       |  40 ---
 .../ElasticsearchLogLargeTextProvider.java    | 287 ------------------
 .../elasticsearch/util/HttpGetWithData.java   |  73 -----
 .../logstash/LogstashDaoLoggingMethod.java    |  85 ------
 .../LogstashDaoLoggingMethodFactory.java      |  48 ---
 .../logstash/RemoteLogstashOutputStream.java  |  83 -----
 .../logstash/RemoteLogstashWriter.java        |  91 ------
 .../src/main/resources/index.jelly            |   5 -
 .../ElasticsearchLogAction/index.jelly        |  43 ---
 .../elasticsearch/ElasticsearchContainer.java | 144 ---------
 .../elasticsearch/PipelineSmokeTest.java      |  78 -----
 .../ElasticsearchContainer/Dockerfile         |   3 -
 pom.xml                                       | 106 ++++++-
 .../jenkins/plugins/extlogging/api/Event.java |   0
 .../api/ExternalLogBrowserFactory.java        |   0
 .../ExternalLogBrowserFactoryDescriptor.java  |   0
 .../extlogging/api/ExternalLoggingMethod.java |   0
 .../api/ExternalLoggingMethodFactory.java     |   0
 ...xternalLoggingMethodFactoryDescriptor.java |   0
 .../api/SensitiveStringsProvider.java         |   0
 .../DisabledExternalLogBrowserFactory.java    |   0
 .../DisabledExternalLoggingMethodFactory.java |   0
 .../api/impl/ExternalLoggingEventWriter.java  |   0
 .../ExternalLoggingGlobalConfiguration.java   |   0
 .../impl/ExternalLoggingMethodLocator.java    |   0
 .../api/impl/ExternalLoggingOutputStream.java |   0
 ...ggingThroughMasterOutputStreamWrapper.java |   0
 .../MaskSensitiveStringsProvider.java         |   0
 .../pipeline/ExternalPipelineLogStorage.java  |   0
 .../ExternalPipelineLogStorageFactory.java    |   0
 .../api/util/AbstractConsoleAction.java       |   0
 .../api/util/MaskSecretsOutputStream.java     |   0
 .../extlogging/api/util/UniqueIdHelper.java   |   0
 .../src => src}/main/resources/index.jelly    |   0
 .../config.jelly                              |   0
 .../AbstractConsoleAction/buildCaption.jelly  |   0
 .../extlogging/api/FreestyleJobTest.java      |   0
 .../extlogging/api/PipelineSmokeTest.java     |   0
 .../util/MockExternalLoggingEventWriter.java  |   0
 .../extlogging/api/util/MockLogBrowser.java   |   0
 .../api/util/MockLogBrowserFactory.java       |   0
 .../api/util/MockLoggingMethod.java           |   0
 .../api/util/MockLoggingMethodFactory.java    |   0
 .../api/util/MockLoggingTestUtil.java         |   0
 62 files changed, 96 insertions(+), 1803 deletions(-)
 delete mode 100644 demo/Makefile
 delete mode 100644 demo/README.md
 delete mode 100644 demo/docker-compose.yml
 delete mode 100644 demo/packager-config.yml
 delete mode 100644 demo/pom.xml
 delete mode 100644 demo/src/main/groovy/1_System.groovy
 delete mode 100644 demo/src/main/groovy/2_ExtLogging.groovy
 delete mode 100644 demo/src/main/groovy/3_Agent.groovy
 delete mode 100644 demo/src/main/groovy/4_Jobs.groovy
 delete mode 100644 demo/src/main/groovy/5_SaveToDisk.groovy
 delete mode 100644 demo/src/main/java/Stub.java
 delete mode 100644 external-logging-api/pom.xml
 delete mode 100644 external-logging-elasticsearch/.mvn/extensions.xml
 delete mode 100644 external-logging-elasticsearch/.mvn/maven.config
 delete mode 100644 external-logging-elasticsearch/Jenkinsfile
 delete mode 100644 external-logging-elasticsearch/README.md
 delete mode 100644 external-logging-elasticsearch/pom.xml
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogLargeTextProvider.java
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java
 delete mode 100644 external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
 delete mode 100644 external-logging-elasticsearch/src/main/resources/index.jelly
 delete mode 100644 external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly
 delete mode 100644 external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
 delete mode 100644 external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
 delete mode 100644 external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/Event.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java (100%)
 rename {external-logging-api/src => src}/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java (100%)
 rename {external-logging-api/src => src}/main/resources/index.jelly (100%)
 rename {external-logging-api/src => src}/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly (100%)
 rename {external-logging-api/src => src}/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java (100%)
 rename {external-logging-api/src => src}/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java (100%)

diff --git a/demo/Makefile b/demo/Makefile
deleted file mode 100644
index 27b6e2a..0000000
--- a/demo/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Just a Makefile for manual testing
-.PHONY: all
-
-ARTIFACT_ID = jenkins-external-task-logging-elk-demo
-VERSION = 2.121.1-elk-SNAPSHOT
-CWP_VERSION= 0.1-alpha-8
-
-all: clean build
-
-clean:
-	rm -rf tmp
-	mkdir tmp
-
-build: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
-
-tmp/output/target/${ARTIFACT_ID}-${VERSION}.war:
-	mvn com.googlecode.maven-download-plugin:download-maven-plugin:1.4.0:artifact \
-		-DgroupId=io.jenkins.tools.custom-war-packager \
-		-DartifactId=custom-war-packager-cli \
-		-Dclassifier=jar-with-dependencies \
-		-Dversion=${CWP_VERSION} \
-		-DoutputDirectory=tmp \
-		-DoutputFileName=cwp-cli.jar
-	java -jar tmp/cwp-cli.jar \
-	    -configPath packager-config.yml -version ${VERSION}
-
-run: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
-	docker-compose rm -fv
-	docker-compose up --build --force-recreate jenkins elk
-
-debug: tmp/output/target/${ARTIFACT_ID}-${VERSION}.war
-	docker-compose rm -fv
-	docker-compose up --build --force-recreate jenkinsDebug elk
diff --git a/demo/README.md b/demo/README.md
deleted file mode 100644
index 6e1825a..0000000
--- a/demo/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-External Task Logging to Elasticsearch Demo
-===
-
-This demo packages Jenkins WAR for External Task Logging to Elasticsearch with help of Logstash plugin.
-
-This demo includes [Logstash Plugin PR#18](https://github.com/jenkinsci/logstash-plugin/pull/18) and
-all its upstream dependencies. 
-It also bundles auto-configuration System Groovy scripts, so that the WAR file starts
-up with pre-configured Logstash plugin settings and some other configs.
-
-Features of the demo:
-
-* Pipeline jobs logging goes to Elasticsearch
-* When tasks are executed on agents, the logs get posted to Elasticsearch directly
-  without passing though the master and causing scalability issues
-* Pipeline jobs override standard Log actions in the Jenkins core, so the
-  underlying implementation is transparent to users
-* Secrets are escaped in stored/displayed logs when running on master and agents.
-* Console annotations work as they work for common Jenkins instances
-* Log blocks are collapsible in the _Console_ screen
-* Origin container ID of every message is visible in Kibana (if you have set that up) via sender field
-
-The demo can be run in Docker Compose,
-ELK stack is provided by the [sebp/elk](https://hub.docker.com/r/sebp/elk/)  image in this case.
-
-## Prerequisites
-
-* Docker and Docker Compose are installed
-
-## Building demo
-
-To build the demo...
-
-1. Go to the repository root, run `mvn clean package` to build Jenkins Custom WAR Packager
-2. Change directory to the demo root
-3. Run `make build`
-
-First build may take a while, because the packager will need to checkout and build 
-many repositories.
-
-## Running demo
-
-1. Run `make run`. It will spin up the demo with predefined environment.
-   Jenkins will be available on the port 8080, credentials: `admin/admin`
-2. If you want to run demo jobs on the agent, 
-also run `docker-compose up agent` in a separate terminal window
-3. In order to access the instance, use the "admin/admin" credentials.
-4. Run one of the demo jobs.   
-5. Browse logs
-  * Classic Log action queries data from Elasticsearch
-  * There is a _Log (Kibana)_ action in runs, which shows Kibana. 
-  * In order to see Kibana logs, you will need to configure the default index in the 
-    embedded page once Jenkins starts up. Use `logstash/` as a default index and 
-    `@timestamp` as data source
-
-## Manual run
-
-This guideline allows to run the demo locally.
-Only Logstash will be preconfigured.
-
-1. Run `docker run -p 5601:5601 -p 9200:9200 -p 5044:5044 -it --name elk sebp/elk:es241_l240_k461` 
-to start the Docker container to to expose ports
-2. Run Jenkins using `JENKINS_HOME=$(pwd)/work java -jar tmp/output/target/external-task-logging-elk-2.107.3-elk-SNAPSHOT.war --httpPort=8080 --prefix=/jenkins` 
-(or just `run run.sh`).
-  * If needed, the demo can be configured by setting system properties
-  * `elasticsearch.host` - host, defaults to `http://elk`
-  * `elasticsearch.port` - Elasticsearch port, defaults to `9200`
-  * `logstash.key` - Path to the root index/key for logging, defaults to `/logstash/logs`
-  * `elasticsearch.username` and `elasticsearch.password` - 
-3. Pass through the installation Wizard
-4. Create a Pipeline job with some logging (e.g. `echo` commands), run it
-5. Browse logs (see above)
diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
deleted file mode 100644
index 7edb6fd..0000000
--- a/demo/docker-compose.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: '3'
-
-services:
-  elk:
-    image: sebp/elk:es241_l240_k461
-    container_name: elk
-    ports:
-      - "5601:5601" # Kibana
-      - "9200:9200" # Elasticsearch
-      - "5044:5044" # Logstash
-    expose:
-      - "5601"
-      - "9200"
-      - "5044"
-  jenkins:
-    image: jenkins/demo-external-task-logging-elk:latest
-    container_name: jenkins
-    links:
-      - elk
-    environment:
-      - JAVA_OPTS=-Dio.jenkins.demo.external-task-logging-elk.enabled=true -Djenkins.install.runSetupWizard=false
-    ports:
-      - "8080:8080"
-      - "9000:9000"
-    expose:
-      - "8080"
-      - "9000"
-  jenkinsDebug:
-    image: jenkins/demo-external-task-logging-elk:latest
-    container_name: jenkins
-    links:
-      - elk
-    environment:
-      - JAVA_OPTS=-Dio.jenkins.demo.external-task-logging-elk.enabled=true -Djenkins.install.runSetupWizard=false
-      - DEBUG=true
-    ports:
-      - "8080:8080"
-      - "9000:9000"
-      - "5005:5005"
-    expose:
-      - "8080"
-      - "9000"
-      - "5005"
-  agent:
-    image: cloudbees/jnlp-slave-with-java-build-tools:2.2.0
-    links:
-      - elk
-      - jenkins
-    # TODO there is no -noreconnect yet this does not work when first started; you need to relaunch it; work around with wait-for-it: https://docs.docker.com/compose/startup-order/
-    command: -url http://jenkins:8080/ f9bf0c290371481814f8bc235e3c53736ea9cd9f11b466b76ad794b91cb57a0b -workDir "/home/jenkins" agent
diff --git a/demo/packager-config.yml b/demo/packager-config.yml
deleted file mode 100644
index 0b445ab..0000000
--- a/demo/packager-config.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-bundle:
-  groupId: "io.jenkins.tools.war-packager.demo"
-  artifactId: "jenkins-external-task-logging-elk-demo"
-  vendor: "Jenkins project"
-  title: "Jenkins External Task Logging demo for Elasticsearch"
-  description: "Jenkins External Task Logging demo for Elasticsearch, packaged as a single WAR file. It automatically configures logging on startup"
-buildSettings:
-  docker:
-    base: "jenkins/jenkins:2.130"
-    tag: "jenkins/demo-external-task-logging-elk"
-    build: true
-war:
-  groupId: "org.jenkins-ci.main"
-  artifactId: "jenkins-war"
-  source:
-    version: 2.131-SNAPSHOT
-plugins:
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "structs"
-    source:
-      version: 1.14
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "scm-api"
-    source:
-      version: 2.2.7
-  - groupId: "org.jenkins-ci.plugins.workflow"
-    artifactId: "workflow-aggregator"
-    source:
-      version: 2.5
-  - groupId: "org.jenkins-ci.plugins.workflow"
-    artifactId: "workflow-api"
-    source:
-      version: 2.29-rc219.239019e84015
-    build:
-      buildOriginalVersion: true
-  - groupId: "org.jenkins-ci.plugins.workflow"
-    artifactId: "workflow-step-api"
-    source:
-      version: 2.15
-  - groupId: "org.jenkins-ci.plugins.workflow"
-    artifactId: "workflow-support"
-    source:
-      version: 2.19-rc265.3e5e4aeecfff
-    build:
-      buildOriginalVersion: true
-  - groupId: "org.jenkins-ci.plugins.workflow"
-    artifactId: "workflow-job"
-    source:
-      version: 2.22-rc311.5616213fbed0
-    build:
-      buildOriginalVersion: true
-  - groupId: "org.jenkins-ci.plugins.workflow"
-    artifactId: "workflow-durable-task-step"
-    source:
-      version: 2.20-rc333.74dc7c303e6d
-    build:
-      buildOriginalVersion: true
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "logstash"
-    source:
-      version: 2.1.1-SNAPSHOT
-  - groupId: "io.jenkins.plugins.external-logging"
-    artifactId: "external-logging-api"
-    source:
-      version: 1.0-alpha-1-SNAPSHOT
-  - groupId: "io.jenkins.plugins.external-logging"
-    artifactId: "external-logging-elasticsearch"
-    source:
-      version: 1.0-alpha-1-SNAPSHOT
-
-  # Security warnings
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "junit"
-    source:
-      version: 1.24
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "mailer"
-    source:
-      version: 1.21
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "git-client"
-    source:
-      version: 2.7.2
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "credentials-binding"
-    source:
-      version: 1.16
-  - groupId: "org.jenkins-ci.plugins"
-    artifactId: "docker-commons"
-    source:
-      version: 1.13
-systemProperties: {
-    jenkins.model.Jenkins.slaveAgentPort: "9000",
-    jenkins.model.Jenkins.slaveAgentPortEnforce: "true"}
-groovyHooks:
-  - type: "init"
-    id: "initScripts"
-    source:
-      dir: src/main/groovy
diff --git a/demo/pom.xml b/demo/pom.xml
deleted file mode 100644
index 6b5b0d1..0000000
--- a/demo/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-  4.0.0
-
-  
-    org.jenkins-ci.plugins
-    plugin
-    3.15
-    
-  
-
-  io.jenkins.plugins.external-logging
-  external-logging-demo
-  External Logging for Elasticsearch/Logstash Demo
-  The plugin provides API to simplify external logging implementations for Jenkins
-  https://wiki.jenkins.io/display/JENKINS/External+Logging+API+Plugin
-  ${revision}${changelist}
-  hpi
-
-  
-    1.0-alpha-1
-    -SNAPSHOT
-    2.131-SNAPSHOT
-    8
-    true
-  
-  
-  
-    
-      MIT License
-      https://opensource.org/licenses/MIT
-    
-  
-
-  
-    scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git
-    scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git
-    https://github.com/jenkinsci/${project.artifactId}-plugin
-    ${scmTag}
-  
-
-  
-    
-      io.jenkins.plugins.external-logging
-      external-logging-elasticsearch
-      1.0-alpha-1-SNAPSHOT
-    
-  
-
-  
-    
-      
-        org.codehaus.gmaven
-        gmaven-plugin
-        1.5-jenkins-3
-        
-          
-            org.codehaus.gmaven.runtime
-            gmaven-runtime-1.8
-            1.5-jenkins-3
-          
-        
-        
-          
-            
-              compile
-              testCompile
-            
-          
-        
-      
-    
-  
-
-  
-    
-      repo.jenkins-ci.org
-      https://repo.jenkins-ci.org/public/
-    
-  
-  
-    
-      repo.jenkins-ci.org
-      https://repo.jenkins-ci.org/public/
-    
-  
-
-
diff --git a/demo/src/main/groovy/1_System.groovy b/demo/src/main/groovy/1_System.groovy
deleted file mode 100644
index 8132999..0000000
--- a/demo/src/main/groovy/1_System.groovy
+++ /dev/null
@@ -1,68 +0,0 @@
-import hudson.security.csrf.DefaultCrumbIssuer
-import hudson.model.*
-import hudson.security.FullControlOnceLoggedInAuthorizationStrategy
-import hudson.security.HudsonPrivateSecurityRealm
-import hudson.util.Secret
-import jenkins.model.Jenkins
-import jenkins.model.JenkinsLocationConfiguration
-import jenkins.CLI
-import jenkins.security.s2m.AdminWhitelistRule
-import org.kohsuke.stapler.StaplerProxy
-
-import com.cloudbees.plugins.credentials.CredentialsProvider
-import com.cloudbees.plugins.credentials.CredentialsScope
-import com.cloudbees.plugins.credentials.domains.Domain
-import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl
-
-//TODO: Migrate to JCasC once it supports disabling via system property
-
-if (!Boolean.getBoolean("io.jenkins.demo.external-task-logging-elk.enabled")) {
-    // Production mode, we do not configure the system
-    return
-}
-
-println("-- System configuration")
-
-println("--- Installing the Security Realm")
-def securityRealm = new HudsonPrivateSecurityRealm(false)
-User user = securityRealm.createAccount("user", "user")
-user.setFullName("User")
-User admin = securityRealm.createAccount("admin", "admin")
-admin.setFullName("Admin")
-Jenkins.instance.setSecurityRealm(securityRealm)
-
-println("---Installing the demo Authorization strategy")
-Jenkins.instance.authorizationStrategy = new FullControlOnceLoggedInAuthorizationStrategy()
-
-println("--- Configuring Remoting (JNLP4 only, no Remoting CLI)")
-CLI.get().enabled = false
-Jenkins.instance.agentProtocols = new HashSet(["JNLP4-connect"])
-Jenkins.instance.getExtensionList(StaplerProxy.class)
-    .get(AdminWhitelistRule.class)
-    .masterKillSwitch = false
-
-println("--- Checking the CSRF protection")
-if (Jenkins.instance.crumbIssuer == null) {
-    println "CSRF protection is disabled, Enabling the default Crumb Issuer"
-    Jenkins.instance.crumbIssuer = new DefaultCrumbIssuer(true)
-}
-
-println("--- Configuring Quiet Period")
-// We do not wait for anything, demo should be fast
-Jenkins.instance.quietPeriod = 0
-
-println("--- Configuring Email global settings")
-JenkinsLocationConfiguration.get().adminAddress = "admin@non.existent.email"
-// Mailer.descriptor().defaultSuffix = "@non.existent.email"
-
-println("--- Adding test credentials")
-def c = new StringCredentialsImpl(
-    CredentialsScope.GLOBAL,
-    "token",
-    "Test token",
-    Secret.fromString("SECRET_TOKEN_WHICH_SHOULD_NOD_BE_DISPLAYED")
-)
-
-CredentialsProvider.lookupStores(Jenkins.instance).each { it ->
-    it.addCredentials(Domain.global(), c)
-}
diff --git a/demo/src/main/groovy/2_ExtLogging.groovy b/demo/src/main/groovy/2_ExtLogging.groovy
deleted file mode 100644
index 6aa0183..0000000
--- a/demo/src/main/groovy/2_ExtLogging.groovy
+++ /dev/null
@@ -1,26 +0,0 @@
-import jenkins.plugins.logstash.LogstashInstallation
-import jenkins.plugins.logstash.LogstashConfiguration
-import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration
-import io.jenkins.plugins.extlogging.logstash.LogstashDaoLoggingMethodFactory
-import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowserFactory
-
-println("--- Configuring Logstash")
-String logstashPort = System.getProperty("elasticsearch.port");
-
-def descriptor = LogstashInstallation.logstashDescriptor
-descriptor.@type = LogstashIndexerDao.IndexerType.ELASTICSEARCH
-descriptor.@host = System.getProperty("elasticsearch.host", "http://elk")
-descriptor.@port = logstashPort != null ? Integer.parseInt(logstashPort) : 9200
-descriptor.@username = System.getProperty("elasticsearch.username")
-descriptor.@password = System.getProperty("elasticsearch.password")
-descriptor.@key = System.getProperty("logstash.key", "/logstash/logs")
-
-// TODO: Replace by proper initialization once plugin API is fixed
-// Currently setIndexer() method does not change active indexer.
-LogstashConfiguration.instance.@dataMigrated = false
-LogstashConfiguration.instance.migrateData()
-
-println("--- Configuring External Logging")
-ExternalLoggingGlobalConfiguration.instance.loggingMethod = new LogstashDaoLoggingMethodFactory()
-ExternalLoggingGlobalConfiguration.instance.logBrowser = new ElasticsearchLogBrowserFactory()
diff --git a/demo/src/main/groovy/3_Agent.groovy b/demo/src/main/groovy/3_Agent.groovy
deleted file mode 100644
index ac20c95..0000000
--- a/demo/src/main/groovy/3_Agent.groovy
+++ /dev/null
@@ -1,15 +0,0 @@
-import hudson.slaves.DumbSlave;
-import hudson.slaves.JNLPLauncher;
-import jenkins.model.Jenkins;
-import jenkins.slaves.JnlpSlaveAgentProtocol;
-
-import javax.crypto.spec.SecretKeySpec;
-
-println("-- Configuring the agent")
-
-// Hardcode secret so that Docker Compose can connect agents
-JnlpSlaveAgentProtocol.SLAVE_SECRET.@key = new SecretKeySpec(new byte[10], "HmacSHA256");
-
-// Register the agent
-def node = new DumbSlave("agent", "/home/jenkins", new JNLPLauncher(true));
-Jenkins.instance.addNode(node);
diff --git a/demo/src/main/groovy/4_Jobs.groovy b/demo/src/main/groovy/4_Jobs.groovy
deleted file mode 100644
index d0cc7e2..0000000
--- a/demo/src/main/groovy/4_Jobs.groovy
+++ /dev/null
@@ -1,56 +0,0 @@
-//TODO: Migrate to JCasC once it supports disabling via system property
-import jenkins.model.Jenkins
-import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition
-import org.jenkinsci.plugins.workflow.job.WorkflowJob
-
-if (!Boolean.getBoolean("io.jenkins.demo.external-task-logging-elk.enabled")) {
-    // Production mode, we do not configure the system
-    return
-}
-
-println("-- Creating Jobs")
-//TODO: Classes do not work here, so some copy-paste for now
-
-if(Jenkins.instance.getItem("Demo_master") == null) {
-    WorkflowJob project1 = Jenkins.instance.createProject(WorkflowJob.class, "Demo_master")
-    project1.definition = new CpsFlowDefinition(
-        "node('master') {\n" +
-        "  sh \"ping -c 20 google.com\"\n" +
-        "}",
-        true // Sandbox
-    )
-    project1.save()
-}
-
-if(Jenkins.instance.getItem("Demo_agent") == null) {
-    WorkflowJob project2 = Jenkins.instance.createProject(WorkflowJob.class, "Demo_agent")
-    project2.definition = new CpsFlowDefinition(
-        "node('agent') {\n" +
-        "  sh \"echo Hello, world!\"\n" +
-            // TODO Current demo image does not have ping, ORLY (alpine)
-            //    "  sh \"ping -c 20 google.com\"\n" +
-        "}",
-        true // Sandbox
-    )
-    project2.save()
-}
-
-if(Jenkins.instance.getItem("Demo_parallel") == null) {
-    WorkflowJob project3 = Jenkins.instance.createProject(WorkflowJob.class, "Demo_parallel")
-    project3.definition = new CpsFlowDefinition(
-        "parallel local: {\n" +
-        "  node('master') {\n" +
-        "    sh 'for x in 0 1 2 3 4 5 6 7 8 9; do echo \$x; sleep 1; done'\n" +
-        "  }\n" +
-        "}, remote: {\n" +
-        "  node('agent') {\n" +
-        "    withCredentials([string(credentialsId: 'token', variable: 'TOKEN')]) {\n" +
-        "      sh 'echo receiving \$TOKEN'\n" +
-        "      sh 'for x in 0 1 2 3 4 5 6 7 8 9; do echo \$x; sleep 1; done'\n" +
-        "    }\n" +
-        "  }\n" +
-        "}",
-        true // Sandbox
-    )
-    project3.save()
-}
diff --git a/demo/src/main/groovy/5_SaveToDisk.groovy b/demo/src/main/groovy/5_SaveToDisk.groovy
deleted file mode 100644
index 0b18d6f..0000000
--- a/demo/src/main/groovy/5_SaveToDisk.groovy
+++ /dev/null
@@ -1,3 +0,0 @@
-import jenkins.model.Jenkins
-
-Jenkins.instance.save()
diff --git a/demo/src/main/java/Stub.java b/demo/src/main/java/Stub.java
deleted file mode 100644
index 80dfe86..0000000
--- a/demo/src/main/java/Stub.java
+++ /dev/null
@@ -1,6 +0,0 @@
-public class Stub {
-    // Nothing, just to make the compiler happy
-    public void foo() {
-        
-    }
-}
\ No newline at end of file
diff --git a/external-logging-api/pom.xml b/external-logging-api/pom.xml
deleted file mode 100644
index cf86a02..0000000
--- a/external-logging-api/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-  4.0.0
-
-  
-    org.jenkins-ci.plugins
-    plugin
-    3.18
-    
-  
-
-  io.jenkins.plugins.external-logging
-  external-logging-api
-  External Logging API plugin
-  The plugin provides API to simplify external logging implementations for Jenkins
-  https://wiki.jenkins.io/display/JENKINS/External+Logging+API+Plugin
-  ${revision}${changelist}
-  hpi
-
-  
-    1.0-alpha-1
-    -SNAPSHOT
-    2.131-SNAPSHOT
-    8
-    2.28-rc337.8abe7c5204d9 
-    true
-  
-  
-  
-    
-      MIT License
-      https://opensource.org/licenses/MIT
-    
-  
-
-  
-    scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git
-    scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git
-    https://github.com/jenkinsci/${project.artifactId}-plugin
-    ${scmTag}
-  
-
-  
-    
-      org.jenkins-ci.plugins
-      unique-id
-      2.1.1
-    
-    
-      org.jenkins-ci.plugins
-      mask-passwords
-      2.12.0
-      true
-    
-
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-job
-      2.22-rc311.5616213fbed0 
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-support
-      2.19-rc265.3e5e4aeecfff 
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-api
-      2.29-rc219.239019e84015 
-    
-
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-durable-task-step
-      2.20-rc333.74dc7c303e6d 
-      test
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-cps
-      2.19
-      test
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-basic-steps
-      2.2
-      test
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-step-api
-      2.15
-    
-    
-      org.jenkins-ci.plugins
-      scm-api
-      2.2.6
-    
-    
-      org.jenkins-ci.plugins
-      script-security
-      1.39
-    
-    
-      org.jenkins-ci.plugins
-      credentials-binding
-      1.15
-      test
-    
-  
-
-  
-    
-      repo.jenkins-ci.org
-      https://repo.jenkins-ci.org/public/
-    
-  
-  
-    
-      repo.jenkins-ci.org
-      https://repo.jenkins-ci.org/public/
-    
-  
-
-
diff --git a/external-logging-elasticsearch/.mvn/extensions.xml b/external-logging-elasticsearch/.mvn/extensions.xml
deleted file mode 100644
index 510f24f..0000000
--- a/external-logging-elasticsearch/.mvn/extensions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-    io.jenkins.tools.incrementals
-    git-changelist-maven-extension
-    1.0-beta-3
-  
-
diff --git a/external-logging-elasticsearch/.mvn/maven.config b/external-logging-elasticsearch/.mvn/maven.config
deleted file mode 100644
index 2a0299c..0000000
--- a/external-logging-elasticsearch/.mvn/maven.config
+++ /dev/null
@@ -1,2 +0,0 @@
--Pconsume-incrementals
--Pmight-produce-incrementals
diff --git a/external-logging-elasticsearch/Jenkinsfile b/external-logging-elasticsearch/Jenkinsfile
deleted file mode 100644
index 5b60d43..0000000
--- a/external-logging-elasticsearch/Jenkinsfile
+++ /dev/null
@@ -1 +0,0 @@
-buildPlugin(platforms: ['linux'])
diff --git a/external-logging-elasticsearch/README.md b/external-logging-elasticsearch/README.md
deleted file mode 100644
index b991085..0000000
--- a/external-logging-elasticsearch/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# External Logging for Elasticsearch and Logstash plugin
-
diff --git a/external-logging-elasticsearch/pom.xml b/external-logging-elasticsearch/pom.xml
deleted file mode 100644
index 018ae1b..0000000
--- a/external-logging-elasticsearch/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-  4.0.0
-
-  
-    org.jenkins-ci.plugins
-    plugin
-    3.18
-    
-  
-
-  io.jenkins.plugins.external-logging
-  external-logging-elasticsearch
-  Elasticsearch External Logging plugin
-  The plugin implements external logging to Elasticsearch
-  https://wiki.jenkins.io/display/JENKINS/External+Logging+API+Plugin
-  ${revision}${changelist}
-  hpi
-
-  
-    1.0-alpha-1
-    -SNAPSHOT
-    2.131-SNAPSHOT
-    8
-    true
-  
-  
-  
-    
-      MIT License
-      https://opensource.org/licenses/MIT
-    
-  
-
-  
-    scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git
-    scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git
-    https://github.com/jenkinsci/${project.artifactId}-plugin
-    ${scmTag}
-  
-
-  
-    
-      io.jenkins.plugins.external-logging
-      external-logging-api
-      1.0-alpha-1-SNAPSHOT
-    
-    
-      org.jenkins-ci.plugins
-      logstash
-      2.1.1-SNAPSHOT
-    
-    
-      org.jenkins-ci.plugins
-      structs
-      1.14
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-cps
-      2.19
-      test
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-basic-steps
-      2.2
-      test
-    
-    
-      org.jenkins-ci.plugins.workflow
-      workflow-durable-task-step
-      2.20-rc333.74dc7c303e6d 
-      test
-    
-
-    
-    
-      org.jenkins-ci.test
-      docker-fixtures
-      1.7
-      test
-    
-
-  
-
-  
-    
-      repo.jenkins-ci.org
-      https://repo.jenkins-ci.org/public/
-    
-  
-  
-    
-      repo.jenkins-ci.org
-      https://repo.jenkins-ci.org/public/
-    
-  
-
-
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
deleted file mode 100644
index 1f0928e..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowser.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.jenkins.plugins.extlogging.elasticsearch;
-
-import hudson.console.AnnotatedLargeText;
-import hudson.model.Run;
-import jenkins.model.logging.LogBrowser;
-
-import javax.annotation.CheckForNull;
-
-/**
- * @author Oleg Nenashev
- * @since TODO
- */
-public class ElasticsearchLogBrowser extends LogBrowser {
-
-    public ElasticsearchLogBrowser(Run run) {
-        super(run);
-    }
-
-    @Override
-    protected Run getOwner() {
-        return (Run)super.getOwner();
-    }
-
-    //TODO: Cache values instead of refreshing them each time
-    @Override
-    public AnnotatedLargeText overallLog() {
-        return new ElasticsearchLogLargeTextProvider(getOwner(), null).getLogText();
-    }
-
-    @Override
-    public AnnotatedLargeText stepLog(@CheckForNull String stepId, boolean b) {
-        return new ElasticsearchLogLargeTextProvider(getOwner(), stepId).getLogText();
-    }
-}
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java
deleted file mode 100644
index bafe4b6..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogBrowserFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.jenkins.plugins.extlogging.elasticsearch;
-
-import hudson.Extension;
-import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactory;
-import io.jenkins.plugins.extlogging.api.ExternalLogBrowserFactoryDescriptor;
-import jenkins.model.logging.LogBrowser;
-import jenkins.model.logging.Loggable;
-import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.DataBoundConstructor;
-
-import javax.annotation.CheckForNull;
-
-/**
- * Produces {@link ElasticsearchLogBrowser}s.
- * @author Oleg Nenashev
- * @since TODO
- */
-public class ElasticsearchLogBrowserFactory extends ExternalLogBrowserFactory {
-
-    @DataBoundConstructor
-    public ElasticsearchLogBrowserFactory() {
-
-    }
-
-    @CheckForNull
-    @Override
-    public LogBrowser create(Loggable loggable) {
-        if (loggable instanceof Run) {
-            return new ElasticsearchLogBrowser((Run) loggable);
-        }
-        return null;
-    }
-
-    @Extension
-    @Symbol("logstashElasticsearch")
-    public static class DescriptorImpl extends ExternalLogBrowserFactoryDescriptor {
-
-    }
-}
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogLargeTextProvider.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogLargeTextProvider.java
deleted file mode 100644
index e0749ca..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogLargeTextProvider.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package io.jenkins.plugins.extlogging.elasticsearch;
-
-import com.jcraft.jzlib.GZIPInputStream;
-import com.trilead.ssh2.crypto.Base64;
-import hudson.console.AnnotatedLargeText;
-import hudson.console.ConsoleAnnotationOutputStream;
-import hudson.console.ConsoleAnnotator;
-import hudson.model.Run;
-import hudson.remoting.ObjectInputStreamEx;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.Writer;
-import static java.lang.Math.abs;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-
-import io.jenkins.plugins.extlogging.api.util.UniqueIdHelper;
-import io.jenkins.plugins.extlogging.elasticsearch.util.HttpGetWithData;
-import jenkins.model.Jenkins;
-import jenkins.plugins.logstash.LogstashConfiguration;
-import jenkins.plugins.logstash.persistence.ElasticSearchDao;
-import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
-import jenkins.security.CryptoConfidentialKey;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.framework.io.ByteBuffer;
-
-/**
- * Displays Embedded log.
- * @author Oleg Nenashev
- */
-@Restricted(NoExternalUse.class)
-public class ElasticsearchLogLargeTextProvider {
-
-    @Nonnull
-    private Run run;
-
-    @CheckForNull
-    private String stepId;
-
-    public ElasticsearchLogLargeTextProvider(Run run) {
-        this(run, null);
-    }
-
-    public ElasticsearchLogLargeTextProvider(Run run, String stepId) {
-        this.run = run;
-    }
-
-    private transient HttpClientBuilder clientBuilder;
-
-    /**
-     * Used from index.jelly to write annotated log to the given
-     * output.
-     * @param offset offset of the log
-     * @param out destination output
-     */
-    public void writeLogTo(long offset, @Nonnull XMLOutput out) throws IOException {
-        try {
-            getLogText().writeHtmlTo(offset, out.asWriter());
-        } catch (IOException e) {
-            // try to fall back to the old getLogInputStream()
-            // mainly to support .gz compressed files
-            // In this case, console annotation handling will be turned off.
-            InputStream input = readLogToBuffer(offset).newInputStream();
-            try {
-                IOUtils.copy(input, out.asWriter());
-            } finally {
-                IOUtils.closeQuietly(input);
-            }
-        }
-    }
-    
-    /**
-     * Used to URL-bind {@link AnnotatedLargeText}.
-     * @return A {@link Run} log with annotations
-     */   
-    public @Nonnull AnnotatedLargeText getLogText() {
-        ByteBuffer buf;
-        try {
-            buf = readLogToBuffer(0);
-        } catch (IOException ex) {
-            buf = new ByteBuffer();
-        }
-        return new UncompressedAnnotatedLargeText(buf, StandardCharsets.UTF_8, !run.isLogUpdated(), this);
-    }
-    
-    /**
-     * Returns an input stream that reads from the log file.
-     * @throws IOException Operation error
-     */
-    @Nonnull 
-    public ByteBuffer readLogToBuffer(long initialOffset) throws IOException {
-        LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance();
-        if (!(dao instanceof ElasticSearchDao)) {
-            throw new IOException("Cannot brows logs, Elasticsearch Dao must be configured in the Logstash plugin");
-        }
-        ElasticSearchDao esDao = (ElasticSearchDao)dao;
-        
-        ByteBuffer buffer = new ByteBuffer();
-        Collection pulledLogs = pullLogs(esDao,0, Long.MAX_VALUE);
-        long ctr = 0;
-        for (String logEntry : pulledLogs) {
-            byte[] bytes = logEntry.getBytes();
-            
-            buffer.write(bytes, 0, bytes.length);
-            buffer.write('\n');
-            
-        }
-        return buffer;
-    }
-
-    private Collection pullLogs(ElasticSearchDao dao, long sinceMs, long toMs) throws IOException {
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
-
-        // Determine job id
-        String jobId = UniqueIdHelper.getOrCreateId(run);
-
-        // Prepare query
-        String query = "{\n" +
-                "  \"fields\": [\"message\",\"@timestamp\"], \n" +
-                "  \"size\": 9999, \n" + // TODO use paging https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-from-size.html
-                "  \"query\": { \n" +
-                "    \"bool\": { \n" +
-                "      \"must\": [\n" +
-                "        { \"match\": { \"data.jobId\":   \"" + jobId + "\"}}, \n" +
-                (stepId != null ?
-                "        { \"match\": { \"data.stepId\": \"" + stepId + "\" }},  \n"
-                : "") +
-                "        { \"match\": { \"data.buildNum\": \"" + run.getNumber() + "\" }}  \n" +
-                "      ]\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-
-
-        // Prepare request
-        final HttpGetWithData getRequest = new HttpGetWithData(dao.getUri() + "/_search");
-        final StringEntity input = new StringEntity(query, ContentType.APPLICATION_JSON);
-        getRequest.setEntity(input);
-
-        if (dao.getUsername() != null) {
-            //TODO: Make the logic public in the Logstash plugin
-            String auth = org.apache.commons.codec.binary.Base64.encodeBase64String(
-                    (dao.getUsername() + ":" + StringUtils.defaultString(dao.getPassword())).getBytes(StandardCharsets.UTF_8));
-            getRequest.addHeader("Authorization", "Basic " + auth);
-        }
-
-        try {
-            httpClient = clientBuilder().build();
-            response = httpClient.execute(getRequest);
-
-            if (response.getStatusLine().getStatusCode() != 200) {
-                throw new IOException(HttpGetWithData.getErrorMessage(dao.getUri(), response));
-            }
-
-            // TODO: retrieve log entries
-            final String content;
-            try(InputStream i = response.getEntity().getContent()) {
-                content = IOUtils.toString(i);
-            }
-
-            final JSONObject json = JSONObject.fromObject(content);
-            JSONArray jsonArray = json.getJSONObject("hits").getJSONArray("hits");
-            ArrayList res = new ArrayList<>(jsonArray.size());
-            for (int i=0; i " +message);
-            }
-            Collections.sort(res);
-            return res;
-
-        } finally {
-            if (response != null) {
-                response.close();
-            }
-            if (httpClient != null) {
-                httpClient.close();
-            }
-        }
-    }
-
-    HttpClientBuilder clientBuilder() {
-        if (clientBuilder == null) {
-            clientBuilder = HttpClientBuilder.create();
-        }
-        return clientBuilder;
-    }
-    
-    public static class UncompressedAnnotatedLargeText extends AnnotatedLargeText {
-
-        private T context;
-        private ByteBuffer memory;
-        
-        public UncompressedAnnotatedLargeText(ByteBuffer memory, Charset charset, boolean completed, T context) {
-            super(memory, charset, completed, context);
-            this.context = context;
-            this.memory = memory;
-        }
-         
-        @Override
-        public long writeHtmlTo(long start, Writer w) throws IOException {
-            ConsoleAnnotationOutputStream caw = new ConsoleAnnotationOutputStream(
-                    w, createAnnotator(Stapler.getCurrentRequest()), context, charset);
-            long r = super.writeLogTo(start, caw);
-            caw.flush();
-            long initial = memory.length();
-            /*
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            Cipher sym = PASSING_ANNOTATOR.encrypt();
-            ObjectOutputStream oos = new ObjectOutputStream(new GZIPOutputStream(new CipherOutputStream(baos, sym)));
-            oos.writeLong(System.currentTimeMillis()); // send timestamp to prevent a replay attack
-            oos.writeObject(caw.getConsoleAnnotator());
-            oos.close();
-            StaplerResponse rsp = Stapler.getCurrentResponse();
-            if (rsp != null) {
-                rsp.setHeader("X-ConsoleAnnotator", new String(Base64.encode(baos.toByteArray())));
-            }
-            return r;
-            */
-            
-            /*
-            try {
-                memory.writeTo(caw);
-            } finally {
-                caw.flush();
-                caw.close();
-            }*/
-            return initial - memory.length(); 
-        }
-        
-        /**
-        * Used for sending the state of ConsoleAnnotator to the client, because we are deserializing this object later.
-        */
-        private static final CryptoConfidentialKey PASSING_ANNOTATOR = new CryptoConfidentialKey(AnnotatedLargeText.class,"consoleAnnotator");
-
-        
-        private ConsoleAnnotator createAnnotator(StaplerRequest req) throws IOException {
-        try {
-            String base64 = req!=null ? req.getHeader("X-ConsoleAnnotator") : null;
-            if (base64!=null) {
-                Cipher sym = PASSING_ANNOTATOR.decrypt();
-
-                ObjectInputStream ois = new ObjectInputStreamEx(new GZIPInputStream(
-                        new CipherInputStream(new ByteArrayInputStream(Base64.decode(base64.toCharArray())),sym)),
-                        Jenkins.getInstance().pluginManager.uberClassLoader);
-                try {
-                    long timestamp = ois.readLong();
-                    if (TimeUnit.HOURS.toMillis(1) > abs(System.currentTimeMillis()-timestamp))
-                        // don't deserialize something too old to prevent a replay attack
-                        return (ConsoleAnnotator)ois.readObject();
-                } finally {
-                    ois.close();
-                }
-            }
-        } catch (ClassNotFoundException e) {
-            throw new IOException(e);
-        }
-        // start from scratch
-        return ConsoleAnnotator.initial(context==null ? null : context.getClass());
-    }
-    }
-}
\ No newline at end of file
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java
deleted file mode 100644
index 549d7e7..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/elasticsearch/util/HttpGetWithData.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package io.jenkins.plugins.extlogging.elasticsearch.util;
-
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.protocol.HTTP;
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-
-@Restricted(NoExternalUse.class)
-public class HttpGetWithData extends HttpGet implements HttpEntityEnclosingRequest {
-    private HttpEntity entity;
-
-    public HttpGetWithData(String uri) {
-        super(uri);
-    }
-
-    @Override
-    public HttpEntity getEntity() {
-        return this.entity;
-    }
-
-    @Override
-    public void setEntity(final HttpEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public boolean expectContinue() {
-        final Header expect = getFirstHeader(HTTP.EXPECT_DIRECTIVE);
-        return expect != null && HTTP.EXPECT_CONTINUE.equalsIgnoreCase(expect.getValue());
-    }
-
-    public static String getErrorMessage(URI uri, CloseableHttpResponse response) {
-        ByteArrayOutputStream byteStream = null;
-        PrintStream stream = null;
-        try {
-            byteStream = new ByteArrayOutputStream();
-            stream = new PrintStream(byteStream, true, StandardCharsets.UTF_8.name());
-
-            try {
-                stream.print("HTTP error code: ");
-                stream.println(response.getStatusLine().getStatusCode());
-                stream.print("URI: ");
-                stream.println(uri.toString());
-                stream.println("RESPONSE: " + response.toString());
-                response.getEntity().writeTo(stream);
-            } catch (IOException e) {
-                stream.println(ExceptionUtils.getStackTrace(e));
-            }
-            stream.flush();
-            return byteStream.toString(StandardCharsets.UTF_8.name());
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            return ExceptionUtils.getStackTrace(e);
-        } finally {
-            if (stream != null) {
-                stream.close();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
deleted file mode 100644
index 2271781..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethod.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.jenkins.plugins.extlogging.logstash;
-
-import hudson.model.Run;
-import hudson.model.TaskListener;
-import java.io.OutputStream;
-import java.util.List;
-
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
-import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowser;
-import jenkins.model.logging.LogBrowser;
-import jenkins.model.logging.Loggable;
-import jenkins.plugins.logstash.LogstashConfiguration;
-import jenkins.plugins.logstash.persistence.ElasticSearchDao;
-import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
-/**
- * Perform logging to {@link LogstashIndexerDao}.
- *
- * @author Oleg Nenashev
- */
-public class LogstashDaoLoggingMethod extends ExternalLoggingMethod {
-
-    @CheckForNull
-    private final String prefix;
-
-    public LogstashDaoLoggingMethod(Run run, @CheckForNull String prefix) {
-        super(run);
-        this.prefix = prefix;
-    }
-
-    @Override
-    protected Run getOwner() {
-        return (Run)super.getOwner();
-    }
-
-    @Override
-    public LogBrowser getDefaultLogBrowser() {
-        LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance();
-        if (dao instanceof ElasticSearchDao) {
-            return new ElasticsearchLogBrowser(getOwner());
-        }
-        return null;
-    }
-
-    @Override
-    public ExternalLoggingEventWriter createWriter() {
-        LogstashIndexerDao dao = LogstashConfiguration.getInstance().getIndexerInstance();
-        return new RemoteLogstashWriter(getOwner(), TaskListener.NULL, prefix, dao);
-    }
-
-    @Override
-    public OutputStream decorateLogger(OutputStream logger) {
-      //  LogstashWriter logstash = new LogstashWriter(run, TaskListener.NULL, logger, prefix);
-      //  RemoteLogstashOutputStream los = new RemoteLogstashOutputStream(logstash, "prefix");
-      //  return los.maskPasswords(SensitiveStringsProvider.getAllSensitiveStrings(run));
-        // TODO: implement
-        return null;
-    }
-
-    private static class LogstashOutputStreamWrapper implements OutputStreamWrapper {
-
-        private final RemoteLogstashWriter wr;
-        private final List passwordStrings;
-
-        public LogstashOutputStreamWrapper(RemoteLogstashWriter wr, List passwordStrings, String prefix) {
-            this.wr = wr;
-            this.passwordStrings = passwordStrings;
-        }
-
-        public Object readResolve() {
-            return ExternalLoggingOutputStream.createOutputStream(wr, passwordStrings);
-        }
-
-        @Override
-        public OutputStream toSerializableOutputStream() {
-            return ExternalLoggingOutputStream.createOutputStream(wr, passwordStrings);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java
deleted file mode 100644
index 8948ea1..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/LogstashDaoLoggingMethodFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.jenkins.plugins.extlogging.logstash;
-
-import hudson.Extension;
-import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactory;
-import io.jenkins.plugins.extlogging.api.ExternalLoggingMethodFactoryDescriptor;
-import io.jenkins.plugins.extlogging.elasticsearch.ElasticsearchLogBrowser;
-import jenkins.model.logging.Loggable;
-import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.DataBoundSetter;
-
-import javax.annotation.CheckForNull;
-
-/**
- * @author Oleg Nenashev
- * @since TODO
- */
-public class LogstashDaoLoggingMethodFactory extends ExternalLoggingMethodFactory {
-
-    @CheckForNull
-    private String prefix;
-
-    @DataBoundConstructor
-    public LogstashDaoLoggingMethodFactory() {
-
-    }
-
-    @DataBoundSetter
-    public void setPrefix(@CheckForNull String prefix) {
-        this.prefix = prefix;
-    }
-
-    @Override
-    public ExternalLoggingMethod create(Loggable loggable) {
-        if (loggable instanceof Run) {
-            return new LogstashDaoLoggingMethod((Run) loggable, prefix);
-        }
-        return null;
-    }
-
-    @Extension
-    @Symbol("logstash")
-    public static final class DescriptorImpl extends ExternalLoggingMethodFactoryDescriptor {
-
-    }
-}
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java
deleted file mode 100644
index a126e6d..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashOutputStream.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2014 K Jonathan Harker & Rusty Gerard
- *
- * 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.
- */
-package io.jenkins.plugins.extlogging.logstash;
-
-import hudson.console.ConsoleNote;
-import hudson.console.LineTransformationOutputStream;
-import io.jenkins.plugins.extlogging.api.util.MaskSecretsOutputStream;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
-public class RemoteLogstashOutputStream extends LineTransformationOutputStream {
-
-    final RemoteLogstashWriter logstash;
-    final String prefix;
-
-    private static final Logger LOGGER = Logger.getLogger(RemoteLogstashOutputStream.class.getName());
-
-    public RemoteLogstashOutputStream(RemoteLogstashWriter logstash, String prefix) {
-        super();
-        this.logstash = logstash;
-        this.prefix = prefix;
-    }
-
-    
-    public MaskSecretsOutputStream maskPasswords(List passwordStrings) {
-      return new MaskSecretsOutputStream(this, passwordStrings);
-    }
-    
-    @Override
-    protected void eol(byte[] b, int len) throws IOException {
-        try {
-            this.flush();
-            if (!logstash.isConnectionBroken()) {
-                String line = new String(b, 0, len).trim();
-                line = ConsoleNote.removeNotes(line);
-                logstash.writeMessage(prefix + line);
-            }
-        } catch (Throwable ex) {
-            LOGGER.log(Level.SEVERE, "BOOM", ex);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void flush() throws IOException {
-        super.flush();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void close() throws IOException {
-        super.close();
-    }
-}
diff --git a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java b/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
deleted file mode 100644
index 479b9e9..0000000
--- a/external-logging-elasticsearch/src/main/java/io/jenkins/plugins/extlogging/logstash/RemoteLogstashWriter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-
-package io.jenkins.plugins.extlogging.logstash;
-
-import hudson.model.Run;
-import hudson.model.TaskListener;
-import io.jenkins.plugins.extlogging.api.Event;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
-import jenkins.model.Jenkins;
-import jenkins.plugins.logstash.persistence.BuildData;
-import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang.exception.ExceptionUtils;
-
-import javax.annotation.CheckForNull;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class RemoteLogstashWriter extends ExternalLoggingEventWriter {
-
-    private static final long serialVersionUID = 1L;
-    private static final Logger LOGGER = Logger.getLogger(RemoteLogstashWriter.class.getName());
-
-    @CheckForNull
-    private final String prefix;
-    private final BuildData buildData;
-    private final String jenkinsUrl;
-    private final LogstashIndexerDao dao;
-    private boolean connectionBroken;
-
-    public RemoteLogstashWriter(Run run, TaskListener listener, String prefix, LogstashIndexerDao dao) {
-        this.prefix = prefix;
-        this.jenkinsUrl = Jenkins.get().getRootUrl();
-        this.buildData = new BuildData(run, new Date(), listener);
-        this.dao = dao;
-    }
-
-    @Override
-    public void writeMessage(String message) throws IOException {
-        super.writeMessage(prefix != null ? prefix + message : message);
-    }
-
-    @Override
-    public void writeEvent(Event event) {
-        JSONObject payload = dao.buildPayload(buildData, jenkinsUrl,
-                Collections.singletonList(event.getMessage()));
-        // TODO: replace Dao implementation by an independent one
-        JSONObject data = payload.getJSONObject("data");
-        for (Map.Entry entry : event.getData().entrySet()) {
-            Object value = entry.getValue();
-            data.put(entry.getKey(), value != null ? value.toString() : null);
-        }
-
-        try {
-            dao.push(payload.toString());
-        } catch (IOException e) {
-            String msg = "[logstash-plugin]: Failed to send log data to " + dao.getDescription() + ".\n"
-                    + "[logstash-plugin]: No Further logs will be sent to " + dao.getDescription() + ".\n"
-                    + ExceptionUtils.getStackTrace(e);
-            logErrorMessage(msg);
-        }
-    }
-
-    /**
-     * @return True if errors have occurred during initialization or write.
-     */
-    public boolean isConnectionBroken() {
-        return connectionBroken || dao == null || buildData == null;
-    }
-
-    /**
-     * Write error message to errorStream and set connectionBroken to true.
-     */
-    private void logErrorMessage(String msg) {
-        connectionBroken = true;
-        LOGGER.log(Level.WARNING, msg);
-    }
-
-    @Override
-    public void flush() throws IOException {
-        // no caching, nothing to do here
-    }
-
-    @Override
-    public void close() throws IOException {
-        // dao handles it
-    }
-}
diff --git a/external-logging-elasticsearch/src/main/resources/index.jelly b/external-logging-elasticsearch/src/main/resources/index.jelly
deleted file mode 100644
index dd3e91d..0000000
--- a/external-logging-elasticsearch/src/main/resources/index.jelly
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-

-    A Jenkins plugin to keep artifacts and Pipeline stashes in Amazon S3.
-

diff --git a/external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly b/external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly
deleted file mode 100644
index 469cce9..0000000
--- a/external-logging-elasticsearch/src/main/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchLogAction/index.jelly
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-  
-  
-  
-      
-
-      
-      
-      
-      
-        
-          ${%skipSome(offset/1024,"consoleFull")}
-        
-        
-          
-        
-      
-
-      
-
-      
-        
-        
-          
-            

-               
-            

-          
-        
-        
-        
-          
-            
-            ${it.writeLogTo(offset,output)}
-          

-        
-      
- 
-  
-    
-
\ No newline at end of file
diff --git a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
deleted file mode 100644
index b68a2f8..0000000
--- a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package io.jenkins.plugins.extlogging.elasticsearch;
-
-import java.lang.reflect.Field;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingGlobalConfiguration;
-import io.jenkins.plugins.extlogging.logstash.LogstashDaoLoggingMethodFactory;
-import jenkins.plugins.logstash.LogstashConfiguration;
-import jenkins.plugins.logstash.LogstashInstallation;
-import jenkins.plugins.logstash.persistence.LogstashIndexerDao;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.jenkinsci.test.acceptance.docker.DockerContainer;
-import org.jenkinsci.test.acceptance.docker.DockerFixture;
-import org.jvnet.hudson.test.JenkinsRule;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
-/**
- * Elasticsearch test container.
- * @author Oleg Nenashev
- */
-@DockerFixture(id = "elasticsearch", ports = 9200)
-public class ElasticsearchContainer extends DockerContainer {
-
-    private static final Logger LOGGER =
-            Logger.getLogger(ElasticsearchContainer.class.getName());
-
-    @Nonnull
-    public URL getURL() {
-        try {
-            return new URL("http://" + ipBound(9200) + ":" + port(9200));
-        } catch (MalformedURLException ex) {
-            throw new AssertionError(ex);
-        }
-    }
-
-    public void configureJenkins(JenkinsRule j) throws AssertionError {
-        try {
-            LogstashInstallation.Descriptor descriptor = LogstashInstallation.getLogstashDescriptor();
-            setField(descriptor, "host", getURL().toString());
-            setField(descriptor, "port", 9200);
-            setField(descriptor, "key", "/logstash/logs");
-            setField(descriptor, "type", LogstashIndexerDao.IndexerType.ELASTICSEARCH);
-
-            // TODO: Replace by proper initialization once plugin API is fixed
-            // Currently setIndexer() method does not change active indexer.
-            LogstashConfiguration cfg = LogstashConfiguration.getInstance();
-            Field dataMigrated = cfg.getClass().getDeclaredField("dataMigrated");
-            dataMigrated.setAccessible(true);
-            dataMigrated.setBoolean(cfg, false);
-            LogstashConfiguration.getInstance().migrateData();
-        } catch (Exception ex) {
-            throw new AssertionError("Failed to configure Logstash Plugin using reflection", ex);
-        }
-
-        ExternalLoggingGlobalConfiguration cfg = ExternalLoggingGlobalConfiguration.getInstance();
-        cfg.setLogBrowser(new ElasticsearchLogBrowserFactory());
-        cfg.setLoggingMethod(new LogstashDaoLoggingMethodFactory());
-
-    }
-
-    private final void setField(LogstashInstallation.Descriptor d, String field, Object value) throws NoSuchFieldException, IllegalAccessException {
-        Field dataMigrated = LogstashInstallation.Descriptor.class.getDeclaredField(field);
-        dataMigrated.setAccessible(true);
-        dataMigrated.set(d, value);
-    }
-
-    public void waitForInit(int timeoutMs) throws AssertionError, Exception {
-
-        long startTime = System.currentTimeMillis();
-        ObjectMapper mapper = new ObjectMapper();
-
-        while (System.currentTimeMillis() < startTime + timeoutMs) {
-            try (CloseableHttpClient httpclient = HttpClients.createMinimal()) {
-                HttpGet httpGet = new HttpGet(getURL().toString());
-                try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
-                    if (response.getStatusLine().getStatusCode() == 200) {
-                        ElasticsearchInfo es = mapper.readValue(response.getEntity().getContent(), ElasticsearchInfo.class);
-                        LOGGER.log(Level.FINE, "ES version: " + es.version.number);
-                        return;
-                    }
-                } catch (NoHttpResponseException ex) {
-                  // Fine, keep trying
-                } catch (Exception ex) {
-                    // keep trying
-                    LOGGER.log(Level.WARNING, "Wrong response", ex);
-                }
-            }
-            Thread.sleep(1000);
-        }
-
-        throw new TimeoutException("Elasticsearch connection timeout: " + timeoutMs + "ms");
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ElasticsearchInfo {
-
-        @JsonProperty
-        public int status;
-
-        @JsonProperty
-        public String name;
-
-        @JsonProperty("cluster_name")
-        public String clusterName;
-
-        @JsonProperty
-        public ElasticsearchVersion version;
-
-        @JsonProperty
-        public String tagline;
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ElasticsearchVersion {
-
-        @JsonProperty
-        public String number;
-
-        @JsonProperty("build_hash")
-        public String buildHash;
-
-        @JsonProperty("build_timestamp")
-        public String buildTimestamp;
-
-        @JsonProperty("build_snapshot")
-        public boolean buildSnapshot;
-
-        @JsonProperty("lucene_version")
-        public String luceneVersion;
-    }
-}
\ No newline at end of file
diff --git a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java b/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
deleted file mode 100644
index 22c1d92..0000000
--- a/external-logging-elasticsearch/src/test/java/io/jenkins/plugins/extlogging/elasticsearch/PipelineSmokeTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.jenkins.plugins.extlogging.elasticsearch;
-
-import hudson.model.Run;
-
-import hudson.model.labels.LabelAtom;
-import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
-import org.jenkinsci.plugins.workflow.job.WorkflowJob;
-import org.jenkinsci.test.acceptance.docker.DockerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-
-/**
- * @author Oleg Nenashev
- * @since TODO
- */
-public class PipelineSmokeTest {
-
-    @Rule
-    public DockerRule esContainer = new DockerRule(ElasticsearchContainer.class);
-    private ElasticsearchContainer container;
-
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
-
-    @Before
-    public void setup() throws Exception {
-        container = esContainer.get();
-        container.waitForInit(30000);
-        container.configureJenkins(j);
-    }
-
-    @Test
-    public void spotcheck_Default() throws Exception {
-        WorkflowJob project = j.createProject(WorkflowJob.class);
-        project.setDefinition(new CpsFlowDefinition("echo 'Hello'", true));
-        Run build = j.buildAndAssertSuccess(project);
-        // Eventual consistency
-        //TODO(oleg_nenashev): Probably we need terminator entries in logs
-        //to automate handling of such use-cases
-        Thread.sleep(1000);
-        j.assertLogContains("Hello", build);
-    }
-
-    @Test
-    public void spotcheck_cycle() throws Exception {
-        WorkflowJob project = j.createProject(WorkflowJob.class);
-        project.setDefinition(new CpsFlowDefinition("" +
-                "for (int i = 0; i<10; i++) {" +
-                "  sleep 1" +
-                "  echo \"count: ${i}\"" +
-                "}", true));
-        Run build = j.buildAndAssertSuccess(project);
-        // Eventual consistency
-        //TODO(oleg_nenashev): Probably we need terminator entries in logs
-        //to automate handling of such use-cases
-        Thread.sleep(1000);
-        j.assertLogContains("count: 9", build);
-    }
-
-    @Test
-    public void spotcheck_Agent() throws Exception {
-        j.createOnlineSlave(new LabelAtom("foo"));
-
-        WorkflowJob project = j.createProject(WorkflowJob.class);
-        project.setDefinition(new CpsFlowDefinition("node('foo') {" +
-                "  sh 'whoami'" +
-                "}", true));
-        Run build = j.buildAndAssertSuccess(project);
-        // Eventual consistency
-        //TODO(oleg_nenashev): Probably we need terminator entries in logs
-        //to automate handling of such use-cases
-        Thread.sleep(1000);
-        j.assertLogContains("Hello", build);
-    }
-
-}
diff --git a/external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile b/external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile
deleted file mode 100644
index 3a080a7..0000000
--- a/external-logging-elasticsearch/src/test/resources/io/jenkins/plugins/extlogging/elasticsearch/ElasticsearchContainer/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM sebp/elk:5610
-
-#TODO: Add support of easy Data browsing for tests?
diff --git a/pom.xml b/pom.xml
index 46de73b..cf86a02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,26 +5,112 @@
   
     org.jenkins-ci.plugins
     plugin
-    3.15
+    3.18
     
   
 
   io.jenkins.plugins.external-logging
-  external-logging-parent-pom
-  Temporary Parent POM
+  external-logging-api
+  External Logging API plugin
+  The plugin provides API to simplify external logging implementations for Jenkins
+  https://wiki.jenkins.io/display/JENKINS/External+Logging+API+Plugin
   ${revision}${changelist}
-  pom
+  hpi
 
   
+    1.0-alpha-1
+    -SNAPSHOT
+    2.131-SNAPSHOT
     8
+    2.28-rc337.8abe7c5204d9 
+    true
   
-
-  
-    external-logging-api
-    external-logging-elasticsearch
-    
-  
   
+  
+    
+      MIT License
+      https://opensource.org/licenses/MIT
+    
+  
+
+  
+    scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git
+    scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git
+    https://github.com/jenkinsci/${project.artifactId}-plugin
+    ${scmTag}
+  
+
+  
+    
+      org.jenkins-ci.plugins
+      unique-id
+      2.1.1
+    
+    
+      org.jenkins-ci.plugins
+      mask-passwords
+      2.12.0
+      true
+    
+
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-job
+      2.22-rc311.5616213fbed0 
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-support
+      2.19-rc265.3e5e4aeecfff 
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-api
+      2.29-rc219.239019e84015 
+    
+
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-durable-task-step
+      2.20-rc333.74dc7c303e6d 
+      test
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-cps
+      2.19
+      test
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-basic-steps
+      2.2
+      test
+    
+    
+      org.jenkins-ci.plugins.workflow
+      workflow-step-api
+      2.15
+    
+    
+      org.jenkins-ci.plugins
+      scm-api
+      2.2.6
+    
+    
+      org.jenkins-ci.plugins
+      script-security
+      1.39
+    
+    
+      org.jenkins-ci.plugins
+      credentials-binding
+      1.15
+      test
+    
+  
+
   
     
       repo.jenkins-ci.org
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java b/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/Event.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactory.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowserFactoryDescriptor.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactory.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethodFactoryDescriptor.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java b/src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/SensitiveStringsProvider.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLogBrowserFactory.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/integrations/MaskPasswordsSensitiveStringsProvider/MaskSensitiveStringsProvider.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorageFactory.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java b/src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java b/src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/util/MaskSecretsOutputStream.java
diff --git a/external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java b/src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java
similarity index 100%
rename from external-logging-api/src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/util/UniqueIdHelper.java
diff --git a/external-logging-api/src/main/resources/index.jelly b/src/main/resources/index.jelly
similarity index 100%
rename from external-logging-api/src/main/resources/index.jelly
rename to src/main/resources/index.jelly
diff --git a/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly b/src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly
similarity index 100%
rename from external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly
rename to src/main/resources/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingGlobalConfiguration/config.jelly
diff --git a/external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly b/src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly
similarity index 100%
rename from external-logging-api/src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly
rename to src/main/resources/io/jenkins/plugins/extlogging/api/util/AbstractConsoleAction/buildCaption.jelly
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java b/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java b/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/PipelineSmokeTest.java
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowser.java
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/util/MockLogBrowserFactory.java
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethodFactory.java
diff --git a/external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java
similarity index 100%
rename from external-logging-api/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java
rename to src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingTestUtil.java

From fdba32beffba240f1fd2692cc3cd28b6787248dd Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 23 Jul 2018 15:28:43 +0300
Subject: [PATCH 16/23] Move Launcher decoration logic from the core to
 External Logging API plugin

---
 .../extlogging/api/ExternalLoggingMethod.java |  34 +++-
 .../extlogging/api/OutputStreamWrapper.java   |  14 ++
 .../api/impl/ExternalLoggingLauncher.java     | 169 ++++++++++++++++++
 ...ggingThroughMasterOutputStreamWrapper.java |   9 +-
 4 files changed, 220 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/io/jenkins/plugins/extlogging/api/OutputStreamWrapper.java
 create mode 100644 src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java

diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index daf7a97..dbdd206 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -1,6 +1,8 @@
 package io.jenkins.plugins.extlogging.api;
 
+import hudson.Launcher;
 import hudson.console.ConsoleLogFilter;
+import hudson.model.Node;
 import hudson.model.Run;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -10,7 +12,9 @@
 import hudson.model.TaskListener;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingLauncher;
 import io.jenkins.plugins.extlogging.api.impl.LoggingThroughMasterOutputStreamWrapper;
+import jenkins.model.Jenkins;
 import jenkins.model.logging.Loggable;
 import jenkins.model.logging.LoggingMethod;
 
@@ -28,7 +32,7 @@ public ExternalLoggingMethod(@Nonnull Loggable loggable) {
         super(loggable);
     }
 
-    //TODO: imple
+    //TODO: implement
     @CheckForNull
     @Override
     public TaskListener createTaskListener() {
@@ -57,9 +61,10 @@ private final OutputStream createOutputStream() {
         return ExternalLoggingOutputStream.createOutputStream(writer, sensitiveStrings);
     }
 
+    //TODO: document null
     /**
      * Creates Remotable wrapper.
-     * By default, logging happens through master unless there is a custom implementation.
+     * By default, logging happens through master unless there is a custom implementation defined.
      * @return Remotable wrapper
      */
     @CheckForNull
@@ -72,12 +77,35 @@ public OutputStreamWrapper createWrapper() {
 
     public abstract OutputStream decorateLogger(OutputStream logger);
 
+    @Nonnull
     @Override
+    public Launcher decorateLauncher(@Nonnull Launcher original,
+                                     @Nonnull Run run, @Nonnull Node node) {
+        if (node instanceof Jenkins) {
+            return new ExternalLoggingLauncher.DefaultLocalLauncher(original);
+        } else {
+            return new ExternalLoggingLauncher.DefaultRemoteLauncher(original, this);
+        }
+    }
+
+    /**
+     * Produces logging engine for STDOUT.
+     * It will be used in the {@link ExternalLoggingLauncher}
+     * @return Wrapper to be used.
+     *         {@code null} will make the wrapper to use the default stream
+     */
+    @CheckForNull
     public OutputStreamWrapper provideRemotableOutStream() {
         return createWrapper();
     }
 
-    @Override
+    /*
+     * Produces logging engine for STDERR.
+     * It will be used in the {@link ExternalLoggingLauncher}
+     * @return Wrapper to be used.
+     *         {@code null} will make the wrapper to use the default stream
+     */
+    @CheckForNull
     public OutputStreamWrapper provideRemotableErrStream() {
         return createWrapper();
     }
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/OutputStreamWrapper.java b/src/main/java/io/jenkins/plugins/extlogging/api/OutputStreamWrapper.java
new file mode 100644
index 0000000..b6d2d88
--- /dev/null
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/OutputStreamWrapper.java
@@ -0,0 +1,14 @@
+package io.jenkins.plugins.extlogging.api;
+
+import org.jenkinsci.remoting.SerializableOnlyOverRemoting;
+
+import java.io.OutputStream;
+
+public interface OutputStreamWrapper extends SerializableOnlyOverRemoting {
+
+    /**
+     * Produces a serializable object which can be sent over the channel
+     * @return Serializable output stream, e.g. {@link hudson.remoting.RemoteOutputStream}
+     */
+    OutputStream toSerializableOutputStream();
+}
\ No newline at end of file
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
new file mode 100644
index 0000000..62cbfde
--- /dev/null
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
@@ -0,0 +1,169 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 Oleg Nenashev.
+ *
+ * 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.
+ */
+package io.jenkins.plugins.extlogging.api.impl;
+
+import hudson.Launcher;
+import hudson.Proc;
+import hudson.model.TaskListener;
+import hudson.remoting.Channel;
+import hudson.remoting.RemoteInputStream;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
+import io.jenkins.plugins.extlogging.api.OutputStreamWrapper;
+import jenkins.model.logging.LoggingMethod;
+import jenkins.security.MasterToSlaveCallable;
+import org.apache.commons.io.input.NullInputStream;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.Beta;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author Oleg Nenashev
+ */
+@Restricted(Beta.class)
+public class ExternalLoggingLauncher {
+
+    /**
+     * Default local launcher, doesn't do anything.
+     */
+    public static class DefaultLocalLauncher extends Launcher.DecoratedLauncher {
+        public DefaultLocalLauncher(Launcher inner) {
+            super(inner);
+        }
+    }
+
+    /**
+     * Default remote launcher which redirects all the output and error to the stream {@link LoggingMethod} provides.
+     */
+    public static class DefaultRemoteLauncher extends Launcher.DecoratedLauncher {
+        private static final NullInputStream NULL_INPUT_STREAM = new NullInputStream(0);
+        private final ExternalLoggingMethod loggingMethod;
+
+        public DefaultRemoteLauncher(Launcher inner, ExternalLoggingMethod loggingMethod) {
+            super(inner);
+            this.loggingMethod = loggingMethod;
+        }
+
+        @Override
+        public Proc launch(Launcher.ProcStarter ps) throws IOException {
+            final OutputStreamWrapper streamOut = loggingMethod.provideRemotableOutStream();
+            final OutputStreamWrapper streamErr = loggingMethod.provideRemotableErrStream();
+
+            // RemoteLogstashReporterStream(new CloseProofOutputStream(ps.stdout()
+            final OutputStream out = ps.stdout() == null ? null : (streamOut == null ? ps.stdout() : streamOut.toSerializableOutputStream());
+            final OutputStream err = ps.stdout() == null ? null : (streamErr == null ? ps.stdout() : streamErr.toSerializableOutputStream());
+            final InputStream in = (ps.stdin() == null || ps.stdin() == NULL_INPUT_STREAM) ? null : new RemoteInputStream(ps.stdin(), false);
+            final String workDir = ps.pwd() == null ? null : ps.pwd().getRemote();
+
+            // TODO: we do not reverse streams => the parameters
+            try {
+                final RemoteLaunchCallable callable = new RemoteLaunchCallable(
+                    ps.cmds(), ps.masks(), ps.envs(), in,
+                    out, err, ps.quiet(), workDir, listener);
+
+                return new Launcher.RemoteLauncher.ProcImpl(getChannel().call(callable));
+            } catch (InterruptedException e) {
+                throw (IOException) new InterruptedIOException().initCause(e);
+            }
+        }
+
+        private static class RemoteLaunchCallable extends
+                MasterToSlaveCallable {
+
+            private final List cmd;
+            private final boolean[] masks;
+            private final String[] env;
+            private final InputStream in;
+            private final OutputStream out;
+            private final OutputStream err;
+            private final String workDir;
+            private final TaskListener listener;
+            private final boolean quiet;
+
+            RemoteLaunchCallable(List cmd, boolean[] masks, String[] env, InputStream in, OutputStream out, OutputStream err, boolean quiet, String workDir, TaskListener listener) {
+                this.cmd = new ArrayList<>(cmd);
+                this.masks = masks;
+                this.env = env;
+                this.in = in;
+                this.out = out;
+                this.err = err;
+                this.workDir = workDir;
+                this.listener = listener;
+                this.quiet = quiet;
+            }
+
+            public Launcher.RemoteProcess call() throws IOException {
+                Launcher.ProcStarter ps = new Launcher.LocalLauncher(listener).launch();
+                ps.cmds(cmd).masks(masks).envs(env).stdin(in).stdout(out).stderr(err).quiet(quiet);
+                if (workDir != null) {
+                    ps.pwd(workDir);
+                }
+
+                final Proc p = ps.start();
+
+                return Channel.current().export(Launcher.RemoteProcess.class, new Launcher.RemoteProcess() {
+                    public int join() throws InterruptedException, IOException {
+                        try {
+                            return p.join();
+                        } finally {
+                            // make sure I/O is delivered to the remote before we return
+                            try {
+                                Channel.current().syncIO();
+                            } catch (Throwable _) {
+                                // this includes a failure to sync, slave.jar too old, etc
+                            }
+                        }
+                    }
+
+                    public void kill() throws IOException, InterruptedException {
+                        p.kill();
+                    }
+
+                    public boolean isAlive() throws IOException, InterruptedException {
+                        return p.isAlive();
+                    }
+
+                    public Launcher.IOTriplet getIOtriplet() {
+                        Launcher.IOTriplet r = new Launcher.IOTriplet();
+                    /* TODO: we do not need reverse?
+                    if (reverseStdout)  r.stdout = new RemoteInputStream(p.getStdout());
+                    if (reverseStderr)  r.stderr = new RemoteInputStream(p.getStderr());
+                    if (reverseStdin)   r.stdin  = new RemoteOutputStream(p.getStdin());
+                     */
+                        return r;
+
+                    }
+                });
+            }
+
+            private static final long serialVersionUID = 1L;
+        }
+    }
+}
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
index 8a4d1e0..316f11b 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/LoggingThroughMasterOutputStreamWrapper.java
@@ -1,17 +1,20 @@
 package io.jenkins.plugins.extlogging.api.impl;
 
 import hudson.remoting.RemoteOutputStream;
-import jenkins.model.logging.LoggingMethod;
+import io.jenkins.plugins.extlogging.api.OutputStreamWrapper;
 
 import java.io.OutputStream;
 
 /**
+ * Default {@link OutputStreamWrapper} implementation, which sends logs through the master.
+ * This wrapper can be used, when {@link io.jenkins.plugins.extlogging.api.ExternalLoggingMethod}
+ * does not support logging from agents.
  * @author Oleg Nenashev
  * @since TODO
  */
-public class LoggingThroughMasterOutputStreamWrapper implements LoggingMethod.OutputStreamWrapper {
+public class LoggingThroughMasterOutputStreamWrapper implements OutputStreamWrapper {
 
-    final OutputStream ostream;
+    private final OutputStream ostream;
 
     public LoggingThroughMasterOutputStreamWrapper(OutputStream stream) {
         this.ostream = stream;

From 64adfc7e7fb908734743d86853b1cd5f39b33eb6 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 23 Jul 2018 23:19:11 +0300
Subject: [PATCH 17/23] Update API to reflect the recent patches in Jenkins
 Core upstream

---
 .../extlogging/api/ExternalLogBrowser.java    | 18 ++++++++++++++
 .../extlogging/api/ExternalLoggingMethod.java | 17 ++++++-------
 .../DisabledExternalLoggingMethodFactory.java |  2 +-
 .../impl/ExternalLoggingBuildListener.java    | 24 +++++++++++++++++++
 .../extlogging/api/FreestyleJobTest.java      |  2 --
 5 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
 create mode 100644 src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java

diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
new file mode 100644
index 0000000..c09e3dc
--- /dev/null
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLogBrowser.java
@@ -0,0 +1,18 @@
+package io.jenkins.plugins.extlogging.api;
+
+import jenkins.model.logging.LogBrowser;
+import jenkins.model.logging.Loggable;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Base abstract class for External Log Browsers.
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public abstract class ExternalLogBrowser extends LogBrowser {
+
+    public ExternalLogBrowser(@Nonnull Loggable loggable) {
+        super(loggable);
+    }
+}
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index dbdd206..53d61b6 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -1,15 +1,16 @@
 package io.jenkins.plugins.extlogging.api;
 
 import hudson.Launcher;
-import hudson.console.ConsoleLogFilter;
+import hudson.model.BuildListener;
 import hudson.model.Node;
 import hudson.model.Run;
-import java.io.IOException;
+
 import java.io.OutputStream;
 import java.util.Collections;
 import java.util.List;
 
 import hudson.model.TaskListener;
+import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingBuildListener;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingLauncher;
@@ -39,17 +40,13 @@ public TaskListener createTaskListener() {
         return null;
     }
 
+    // TODO: Implement event-based logic instead of the
     @Override
-    public ConsoleLogFilter createLoggerDecorator() {
-        return new ConsoleLogFilter() {
-            @Override
-            public OutputStream decorateLogger(Run run, OutputStream logger) throws IOException, InterruptedException {
-                return ExternalLoggingMethod.this.decorateLogger(logger);
-            }
-        };
+    public BuildListener createBuildListener() {
+        return new ExternalLoggingBuildListener(createWriter());
     }
 
-    private final OutputStream createOutputStream() {
+    public final OutputStream createOutputStream() {
         final ExternalLoggingEventWriter writer = createWriter();
 
         final List sensitiveStrings;
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
index b2c9134..9536862 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/DisabledExternalLoggingMethodFactory.java
@@ -25,7 +25,7 @@ public ExternalLoggingMethod create(Loggable loggable) {
     }
 
     @Extension(ordinal = Float.MAX_VALUE)
-    @Symbol("logstash")
+    @Symbol("disabled")
     public static final class DescriptorImpl extends ExternalLoggingMethodFactoryDescriptor {
 
         @Override
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java
new file mode 100644
index 0000000..9c73caa
--- /dev/null
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java
@@ -0,0 +1,24 @@
+package io.jenkins.plugins.extlogging.api.impl;
+
+import hudson.model.BuildListener;
+
+import javax.annotation.Nonnull;
+import java.io.PrintStream;
+
+/**
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class ExternalLoggingBuildListener implements BuildListener {
+
+    private final ExternalLoggingEventWriter writer;
+
+    public ExternalLoggingBuildListener(ExternalLoggingEventWriter writer) {
+        this.writer = writer;
+    }
+
+    @Override
+    public PrintStream getLogger() {
+        return new PrintStream(new ExternalLoggingOutputStream(writer));
+    }
+}
diff --git a/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java b/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
index 9d3b89c..dcf2fea 100644
--- a/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
+++ b/src/test/java/io/jenkins/plugins/extlogging/api/FreestyleJobTest.java
@@ -40,9 +40,7 @@ public void spotcheck_Default() throws Exception {
         j.assertLogContains("hello", build);
     }
 
-    //TODO: implementation issues
     @Test
-    @Ignore
     public void spotcheck_Mock() throws Exception {
         MockLoggingTestUtil.setup(tmpDir);
         FreeStyleProject project = j.createFreeStyleProject();

From e1a8da488e00f4053ea5b58c9377f4de9b614a83 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Mon, 23 Jul 2018 23:33:25 +0300
Subject: [PATCH 18/23] It is no longer required to decorate loggers in the
 implementations

---
 .../plugins/extlogging/api/ExternalLoggingMethod.java |  2 --
 .../api/util/MockExternalLoggingEventWriter.java      |  6 +++---
 .../extlogging/api/util/MockLoggingMethod.java        | 11 ++---------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index 53d61b6..8d6d8c4 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -72,8 +72,6 @@ public OutputStreamWrapper createWrapper() {
 
     public abstract ExternalLoggingEventWriter createWriter();
 
-    public abstract OutputStream decorateLogger(OutputStream logger);
-
     @Nonnull
     @Override
     public Launcher decorateLauncher(@Nonnull Launcher original,
diff --git a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
index 19e32fa..280fd30 100644
--- a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
+++ b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
@@ -6,19 +6,19 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
+ * Mock {@link ExternalLoggingEventWriter} for testing purposes.
  * @author Oleg Nenashev
- * @since TODO
+ * @see MockLoggingMethod
  */
 public class MockExternalLoggingEventWriter extends ExternalLoggingEventWriter {
 
     private static final Logger LOGGER =
             Logger.getLogger(MockExternalLoggingEventWriter.class.getName());
 
-    public File dest;
+    private final File dest;
 
     // Debug flags
     private boolean eventWritten;
diff --git a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
index 5cf2c05..ac1a4c6 100644
--- a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
+++ b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
@@ -7,12 +7,11 @@
 
 import javax.annotation.CheckForNull;
 import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
 
 /**
+ * Mock logging method for testing purposes
  * @author Oleg Nenashev
- * @since TODO
+ * @see MockExternalLoggingEventWriter
  */
 public class MockLoggingMethod extends ExternalLoggingMethod {
 
@@ -40,12 +39,6 @@ public MockExternalLoggingEventWriter getWriter() {
         return writer;
     }
 
-    @Override
-    public OutputStream decorateLogger(OutputStream logger) {
-        return logger;
-    }
-
-    @CheckForNull
     @Override
     public LogBrowser getDefaultLogBrowser() {
         return new MockLogBrowser(getOwner(), baseDir);

From a720913e096aab4b76b1265f530db71cf8e43a38 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Tue, 24 Jul 2018 00:22:55 +0300
Subject: [PATCH 19/23] createWriter() now injects standard metadata to all
 writers

---
 .../extlogging/api/ExternalLoggingMethod.java      | 14 +++++++++++++-
 .../pipeline/ExternalPipelineLogStorage.java       |  2 --
 .../extlogging/api/util/MockLoggingMethod.java     |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index 8d6d8c4..f099461 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -15,6 +15,7 @@
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingLauncher;
 import io.jenkins.plugins.extlogging.api.impl.LoggingThroughMasterOutputStreamWrapper;
+import io.jenkins.plugins.extlogging.api.util.UniqueIdHelper;
 import jenkins.model.Jenkins;
 import jenkins.model.logging.Loggable;
 import jenkins.model.logging.LoggingMethod;
@@ -70,7 +71,18 @@ public OutputStreamWrapper createWrapper() {
         return new LoggingThroughMasterOutputStreamWrapper(createOutputStream());
     }
 
-    public abstract ExternalLoggingEventWriter createWriter();
+    public final ExternalLoggingEventWriter createWriter() {
+        ExternalLoggingEventWriter writer = _createWriter();
+        // Produce universal metadata
+        if (loggable instanceof Run) {
+            Run run = (Run) loggable;
+            writer.addMetadataEntry("jobId", UniqueIdHelper.getOrCreateId(run.getParent()));
+        }
+        return writer;
+    }
+
+    @Nonnull
+    protected abstract ExternalLoggingEventWriter _createWriter();
 
     @Nonnull
     @Override
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
index 3c94421..c316384 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
@@ -90,7 +90,6 @@ public AnnotatedLargeText stepLog(@Nonnull FlowNode flowNode, boolean
         return logBrowser.stepLog(flowNode.getId(), completed);
     }
 
-
     private static class PipelineListener implements BuildListener {
 
         private static final long serialVersionUID = 1;
@@ -102,7 +101,6 @@ private static class PipelineListener implements BuildListener {
         PipelineListener(WorkflowRun run, ExternalLoggingMethod method) {
             this.writer = method.createWriter();
             this.sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings(run);
-            writer.addMetadataEntry("jobId", UniqueIdHelper.getOrCreateId(run.getParent()));
         }
 
         PipelineListener(WorkflowRun run, FlowNode node, ExternalLoggingMethod method) {
diff --git a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
index ac1a4c6..b681538 100644
--- a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
+++ b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
@@ -29,7 +29,7 @@ public MockLoggingMethod(Run run, File baseDir) {
     }
 
     @Override
-    public ExternalLoggingEventWriter createWriter() {
+    public ExternalLoggingEventWriter _createWriter() {
         writer = new MockExternalLoggingEventWriter(new File(baseDir, getOwner().getFullDisplayName() + ".txt"));
         return writer;
     }

From 82515e7da2602e5f21f0a15cb9d773becd54aef6 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Tue, 24 Jul 2018 00:26:58 +0300
Subject: [PATCH 20/23] Document ExternalLoggingMethod#createWriter() methods

---
 .../plugins/extlogging/api/ExternalLoggingMethod.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index f099461..9cc0a8a 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -71,6 +71,12 @@ public OutputStreamWrapper createWrapper() {
         return new LoggingThroughMasterOutputStreamWrapper(createOutputStream());
     }
 
+    /**
+     * Produces an event writer for the object.
+     * This writer is always serializable, so that it can be used on recipient and sender sides.
+     * @return Event writer
+     */
+    @Nonnull
     public final ExternalLoggingEventWriter createWriter() {
         ExternalLoggingEventWriter writer = _createWriter();
         // Produce universal metadata
@@ -81,6 +87,11 @@ public final ExternalLoggingEventWriter createWriter() {
         return writer;
     }
 
+    /**
+     * Produces a base event writer for the object.
+     * This method will be used by {@link #createWriter()}.
+     * @return Event writer
+     */
     @Nonnull
     protected abstract ExternalLoggingEventWriter _createWriter();
 

From 5fc2c5409d1dd3c54cdb00856c2b6cd28a079806 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Tue, 24 Jul 2018 19:22:13 +0300
Subject: [PATCH 21/23] Some API relocations and documentation patches

---
 .../java/io/jenkins/plugins/extlogging/api/Event.java    | 9 +++++----
 .../api/{impl => }/ExternalLoggingEventWriter.java       | 9 ++++-----
 .../plugins/extlogging/api/ExternalLoggingMethod.java    | 1 -
 .../api/impl/ExternalLoggingBuildListener.java           | 2 +-
 .../extlogging/api/impl/ExternalLoggingLauncher.java     | 3 ++-
 .../api/impl/ExternalLoggingMethodLocator.java           | 3 ++-
 .../extlogging/api/impl/ExternalLoggingOutputStream.java | 1 +
 .../pipeline/ExternalPipelineLogStorage.java             | 4 +---
 .../api/util/MockExternalLoggingEventWriter.java         | 2 +-
 .../plugins/extlogging/api/util/MockLoggingMethod.java   | 2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)
 rename src/main/java/io/jenkins/plugins/extlogging/api/{impl => }/ExternalLoggingEventWriter.java (84%)

diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/Event.java b/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
index ffe7767..c6e8aac 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/Event.java
@@ -1,10 +1,11 @@
 package io.jenkins.plugins.extlogging.api;
 
-import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
+ * Stores events which can be sent over the channel.
  * @author Oleg Nenashev
  * @since TODO
  */
@@ -14,7 +15,7 @@ public class Event {
     final long timestamp;
     final long id;
 
-    Map data = new HashMap<>();
+    Map data = new HashMap<>();
 
     public Event(long id, String message, long timestamp) {
         this.id = id;
@@ -34,7 +35,7 @@ public long getTimestamp() {
         return timestamp;
     }
 
-    public Map getData() {
+    public Map getData() {
         return data;
     }
 
@@ -43,7 +44,7 @@ public String toString() {
         return String.format("[%d] - %s", timestamp, message);
     }
 
-    public void setData(Map data) {
+    public void setData(Map data) {
         this.data = data;
     }
 
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java
similarity index 84%
rename from src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
rename to src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java
index 74a30f3..307baa3 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingEventWriter.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingEventWriter.java
@@ -1,6 +1,4 @@
-package io.jenkins.plugins.extlogging.api.impl;
-
-import io.jenkins.plugins.extlogging.api.Event;
+package io.jenkins.plugins.extlogging.api;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -10,12 +8,13 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
+ * Implements logging of events
  * @author Oleg Nenashev
  * @since TODO
  */
 public abstract class ExternalLoggingEventWriter extends Writer implements Serializable {
 
-    Map metadata = new HashMap<>();
+    Map metadata = new HashMap<>();
     AtomicLong messageCounter = new AtomicLong();
 
     public abstract void writeEvent(Event event) throws IOException;
@@ -26,7 +25,7 @@ public void writeMessage(String message) throws IOException {
         writeEvent(event);
     }
 
-    public void addMetadataEntry(String key, Object value) {
+    public void addMetadataEntry(String key, Serializable value) {
         metadata.put(key, value);
     }
 
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index 9cc0a8a..ad89670 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -11,7 +11,6 @@
 
 import hudson.model.TaskListener;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingBuildListener;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingLauncher;
 import io.jenkins.plugins.extlogging.api.impl.LoggingThroughMasterOutputStreamWrapper;
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java
index 9c73caa..bf024e5 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingBuildListener.java
@@ -1,8 +1,8 @@
 package io.jenkins.plugins.extlogging.api.impl;
 
 import hudson.model.BuildListener;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 
-import javax.annotation.Nonnull;
 import java.io.PrintStream;
 
 /**
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
index 62cbfde..54cbf79 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
@@ -44,7 +44,8 @@
 import java.util.List;
 
 /**
- *
+ * Provides {@link Launcher} implementations for External Logging.
+ * These implementations plug-in {@link ExternalLoggingMethod} into the on-agent executions.
  * @author Oleg Nenashev
  */
 @Restricted(Beta.class)
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
index db6f3e3..f8f6bce 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingMethodLocator.java
@@ -11,8 +11,9 @@
 import javax.annotation.CheckForNull;
 
 /**
+ * Locator which provides logging nethods and browsers from {@link ExternalLoggingGlobalConfiguration}.
  * @author Oleg Nenashev
- * @since TODO
+ * @see ExternalLoggingGlobalConfiguration
  */
 @Extension
 public class ExternalLoggingMethodLocator extends LoggingMethodLocator {
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
index a8db72f..07f451a 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingOutputStream.java
@@ -1,6 +1,7 @@
 package io.jenkins.plugins.extlogging.api.impl;
 
 import hudson.console.LineTransformationOutputStream;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.util.MaskSecretsOutputStream;
 
 import java.io.IOException;
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
index c316384..f5bcde8 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
@@ -28,11 +28,10 @@
 import hudson.console.AnnotatedLargeText;
 import hudson.model.BuildListener;
 import hudson.model.TaskListener;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingOutputStream;
 import io.jenkins.plugins.extlogging.api.SensitiveStringsProvider;
-import io.jenkins.plugins.extlogging.api.util.UniqueIdHelper;
 import jenkins.model.logging.LogBrowser;
 import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
@@ -43,7 +42,6 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Collection;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 
diff --git a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
index 280fd30..c4233f7 100644
--- a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
+++ b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockExternalLoggingEventWriter.java
@@ -1,7 +1,7 @@
 package io.jenkins.plugins.extlogging.api.util;
 
 import io.jenkins.plugins.extlogging.api.Event;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
index b681538..01e8dc2 100644
--- a/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
+++ b/src/test/java/io/jenkins/plugins/extlogging/api/util/MockLoggingMethod.java
@@ -1,7 +1,7 @@
 package io.jenkins.plugins.extlogging.api.util;
 
 import hudson.model.Run;
-import io.jenkins.plugins.extlogging.api.impl.ExternalLoggingEventWriter;
+import io.jenkins.plugins.extlogging.api.ExternalLoggingEventWriter;
 import io.jenkins.plugins.extlogging.api.ExternalLoggingMethod;
 import jenkins.model.logging.LogBrowser;
 

From bf72e10edc2fbdcf13da2379f794de7bf6469b53 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Wed, 25 Jul 2018 00:50:01 +0300
Subject: [PATCH 22/23] External Logging Method calls now propagate errors in
 API

---
 .../extlogging/api/ExternalLoggingMethod.java   | 17 ++++++++++-------
 .../api/impl/ExternalLoggingLauncher.java       | 11 ++++++++---
 .../pipeline/ExternalPipelineLogStorage.java    |  6 +++---
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
index ad89670..be82b04 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/ExternalLoggingMethod.java
@@ -5,6 +5,7 @@
 import hudson.model.Node;
 import hudson.model.Run;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Collections;
 import java.util.List;
@@ -42,11 +43,11 @@ public TaskListener createTaskListener() {
 
     // TODO: Implement event-based logic instead of the
     @Override
-    public BuildListener createBuildListener() {
+    public BuildListener createBuildListener() throws IOException, InterruptedException {
         return new ExternalLoggingBuildListener(createWriter());
     }
 
-    public final OutputStream createOutputStream() {
+    public final OutputStream createOutputStream() throws IOException, InterruptedException {
         final ExternalLoggingEventWriter writer = createWriter();
 
         final List sensitiveStrings;
@@ -65,7 +66,7 @@ public final OutputStream createOutputStream() {
      * @return Remotable wrapper
      */
     @CheckForNull
-    public OutputStreamWrapper createWrapper() {
+    public OutputStreamWrapper createWrapper() throws IOException, InterruptedException {
         //TODO: capture agent in API to allow overrides with checks
         return new LoggingThroughMasterOutputStreamWrapper(createOutputStream());
     }
@@ -76,11 +77,13 @@ public OutputStreamWrapper createWrapper() {
      * @return Event writer
      */
     @Nonnull
-    public final ExternalLoggingEventWriter createWriter() {
+    public final ExternalLoggingEventWriter createWriter() throws IOException, InterruptedException {
         ExternalLoggingEventWriter writer = _createWriter();
         // Produce universal metadata
+        writer.addMetadataEntry("jenkinsUrl", Jenkins.get().getRootUrl());
         if (loggable instanceof Run) {
             Run run = (Run) loggable;
+            writer.addMetadataEntry("buildNum", run.getNumber());
             writer.addMetadataEntry("jobId", UniqueIdHelper.getOrCreateId(run.getParent()));
         }
         return writer;
@@ -92,7 +95,7 @@ public final ExternalLoggingEventWriter createWriter() {
      * @return Event writer
      */
     @Nonnull
-    protected abstract ExternalLoggingEventWriter _createWriter();
+    protected abstract ExternalLoggingEventWriter _createWriter() throws IOException, InterruptedException;
 
     @Nonnull
     @Override
@@ -112,7 +115,7 @@ public Launcher decorateLauncher(@Nonnull Launcher original,
      *         {@code null} will make the wrapper to use the default stream
      */
     @CheckForNull
-    public OutputStreamWrapper provideRemotableOutStream() {
+    public OutputStreamWrapper provideRemotableOutStream() throws IOException, InterruptedException {
         return createWrapper();
     }
 
@@ -123,7 +126,7 @@ public OutputStreamWrapper provideRemotableOutStream() {
      *         {@code null} will make the wrapper to use the default stream
      */
     @CheckForNull
-    public OutputStreamWrapper provideRemotableErrStream() {
+    public OutputStreamWrapper provideRemotableErrStream() throws IOException, InterruptedException {
         return createWrapper();
     }
 
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
index 54cbf79..7995edb 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/impl/ExternalLoggingLauncher.java
@@ -74,8 +74,13 @@ public DefaultRemoteLauncher(Launcher inner, ExternalLoggingMethod loggingMethod
 
         @Override
         public Proc launch(Launcher.ProcStarter ps) throws IOException {
-            final OutputStreamWrapper streamOut = loggingMethod.provideRemotableOutStream();
-            final OutputStreamWrapper streamErr = loggingMethod.provideRemotableErrStream();
+            final OutputStreamWrapper streamOut, streamErr;
+            try {
+                streamOut = loggingMethod.provideRemotableOutStream();
+                streamErr = loggingMethod.provideRemotableErrStream();
+            } catch (InterruptedException ex) {
+                throw new IOException(ex);
+            }
 
             // RemoteLogstashReporterStream(new CloseProofOutputStream(ps.stdout()
             final OutputStream out = ps.stdout() == null ? null : (streamOut == null ? ps.stdout() : streamOut.toSerializableOutputStream());
@@ -137,7 +142,7 @@ public int join() throws InterruptedException, IOException {
                             // make sure I/O is delivered to the remote before we return
                             try {
                                 Channel.current().syncIO();
-                            } catch (Throwable _) {
+                            } catch (Throwable th) {
                                 // this includes a failure to sync, slave.jar too old, etc
                             }
                         }
diff --git a/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
index f5bcde8..f4875bc 100644
--- a/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
+++ b/src/main/java/io/jenkins/plugins/extlogging/api/integrations/pipeline/ExternalPipelineLogStorage.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2016 CloudBees, Inc.
+ * Copyright 2016-2018 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -96,12 +96,12 @@ private static class PipelineListener implements BuildListener {
         private final ExternalLoggingEventWriter writer;
         private transient PrintStream logger;
 
-        PipelineListener(WorkflowRun run, ExternalLoggingMethod method) {
+        PipelineListener(WorkflowRun run, ExternalLoggingMethod method) throws IOException, InterruptedException {
             this.writer = method.createWriter();
             this.sensitiveStrings = SensitiveStringsProvider.getAllSensitiveStrings(run);
         }
 
-        PipelineListener(WorkflowRun run, FlowNode node, ExternalLoggingMethod method) {
+        PipelineListener(WorkflowRun run, FlowNode node, ExternalLoggingMethod method) throws IOException, InterruptedException {
             this(run, method);
             writer.addMetadataEntry("stepId", node.getId());
         }

From 32dc947ab6d41449d37189cb53b6a07b0d296f2f Mon Sep 17 00:00:00 2001
From: Oleg Nenashev 
Date: Tue, 31 Jul 2018 10:17:06 +0200
Subject: [PATCH 23/23] Pick Jenkins core release from Incrementals

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cf86a02..1f76f7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,8 @@
   
     1.0-alpha-1
     -SNAPSHOT
-    2.131-SNAPSHOT
+    2.135-rc15088.42aa6febbbed
     8
-    2.28-rc337.8abe7c5204d9 
     true